From f2633df1be25acdf1a5444bbd301955ae3412297 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Tue, 10 Apr 2018 15:23:30 +0200 Subject: Fix leak of compiler contexts Repeatedly entering a context that was entered before would result in leaking the previously entered context. This can happen when compiling child objects in a QML file, which is done recursively. So before compiling the bindings/function in the child object, first the global context and then the QML context are entered. The fix is to re-use the global context, as it's the same anyway for all objects in the same module. And we can remove entering the QML context, because nothing is in there, and we don't put anything in it ever. Change-Id: Ib1c4259d2dec22df46e96edb65bc3d377e52e671 Reviewed-by: Simon Hausmann --- src/qml/compiler/qv4compilerscanfunctions_p.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/qml/compiler/qv4compilerscanfunctions_p.h') diff --git a/src/qml/compiler/qv4compilerscanfunctions_p.h b/src/qml/compiler/qv4compilerscanfunctions_p.h index 745e9f8a73..87b7210879 100644 --- a/src/qml/compiler/qv4compilerscanfunctions_p.h +++ b/src/qml/compiler/qv4compilerscanfunctions_p.h @@ -84,12 +84,10 @@ public: ScanFunctions(Codegen *cg, const QString &sourceCode, CompilationMode defaultProgramMode); void operator()(AST::Node *node); + void enterGlobalEnvironment(CompilationMode compilationMode); void enterEnvironment(AST::Node *node, CompilationMode compilationMode); void leaveEnvironment(); - void enterQmlScope(AST::Node *ast, const QString &name) - { enterFunction(ast, name, /*formals*/nullptr, /*body*/nullptr, /*expr*/nullptr); } - void enterQmlFunction(AST::FunctionDeclaration *ast) { enterFunction(ast, false); } @@ -149,6 +147,9 @@ protected: bool _allowFuncDecls; CompilationMode defaultProgramMode; + +private: + static constexpr AST::Node *astNodeForGlobalEnvironment = nullptr; }; } -- cgit v1.2.3