Remove IR::Function from the runtime.

This fixes potential leaks of IR::Functions, lowers the memory usage
of the functions that the VM needs (because the IR fields are not
present in the VM::Function), and makes both managed by the module
respectively the ExecutionEngine.

Change-Id: I6748ad98b062f994eae9dd14f1919aec5aa7c0b0
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 11 insertions, 1 deletions

diff --git a/qmljs_engine.cpp b/qmljs_engine.cpp
index 4da9564939..a29088f68e 100644
--- a/qmljs_engine.cpp
+++ b/qmljs_engine.cpp
@@ -222,6 +222,7 @@ ExecutionEngine::~ExecutionEngine()
     delete globalObject.asObject();
     delete rootContext;
     delete stringPool;
+    qDeleteAll(functions);
 }
 
 ExecutionContext *ExecutionEngine::newContext()
@@ -237,6 +238,13 @@ String *ExecutionEngine::identifier(const QString &s)
     return id;
 }
 
+Function *ExecutionEngine::newFunction(const QString &name)
+{
+    VM::Function *f = new VM::Function(name);
+    functions.append(f);
+    return f;
+}
+
 FunctionObject *ExecutionEngine::newNativeFunction(ExecutionContext *scope, String *name, Value (*code)(ExecutionContext *))
 {
     NativeFunction *f = new (memoryManager) NativeFunction(scope, name, code);
@@ -244,8 +252,10 @@ FunctionObject *ExecutionEngine::newNativeFunction(ExecutionContext *scope, Stri
     return f;
 }
 
-FunctionObject *ExecutionEngine::newScriptFunction(ExecutionContext *scope, IR::Function *function)
+FunctionObject *ExecutionEngine::newScriptFunction(ExecutionContext *scope, VM::Function *function)
 {
+    assert(function);
+
     MemoryManager::GCBlocker gcBlocker(memoryManager);
 
     ScriptFunction *f = new (memoryManager) ScriptFunction(scope, function);