Correctly set up nested functions

Make sure we have the correct set of nested functions in
both IR::Function and VM::Function. This is required so
that closures can work correctly.

Change-Id: I42493d5ee503090653b71650c8d19e06c4bcfdda
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 16 insertions, 2 deletions

diff --git a/qv4isel_p.cpp b/qv4isel_p.cpp
index 5a668fa246..b49d4d3adc 100644
--- a/qv4isel_p.cpp
+++ b/qv4isel_p.cpp
@@ -16,8 +16,10 @@ EvalInstructionSelection::EvalInstructionSelection(VM::ExecutionEngine *engine,
     assert(engine);
     assert(module);
 
-    foreach (IR::Function *f, module->functions)
-        _irToVM.insert(f, createFunctionMapping(engine, f));
+    createFunctionMapping(engine, module->rootFunction);
+    foreach (IR::Function *f, module->functions) {
+        assert(_irToVM.contains(f));
+    }
 }
 
 EvalInstructionSelection::~EvalInstructionSelection()
@@ -29,6 +31,8 @@ EvalISelFactory::~EvalISelFactory()
 VM::Function *EvalInstructionSelection::createFunctionMapping(VM::ExecutionEngine *engine, IR::Function *irFunction)
 {
     VM::Function *vmFunction = engine->newFunction(irFunction->name ? *irFunction->name : QString());
+    _irToVM.insert(irFunction, vmFunction);
+
     vmFunction->hasDirectEval = irFunction->hasDirectEval;
     vmFunction->isStrict = irFunction->isStrict;
 
@@ -39,8 +43,18 @@ VM::Function *EvalInstructionSelection::createFunctionMapping(VM::ExecutionEngin
         if (local)
             vmFunction->locals.append(*local);
 
+    foreach (IR::Function *function, irFunction->nestedFunctions)
+        vmFunction->nestedFunctions.append(createFunctionMapping(engine, function));
+
     if (engine->debugger)
         engine->debugger->mapFunction(vmFunction, irFunction);
 
     return vmFunction;
 }
+
+VM::Function *EvalInstructionSelection::vmFunction(IR::Function *f) {
+    VM::Function *function = _irToVM[f];
+    if (!function->code)
+        run(function, f);
+    return function;
+}