Do not chain the current context on entry in non-closure functions, but

runtime/vm/code_generator_ia32.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/code_generator.h"
 
 #include "lib/error.h"
@@ skipping 577 matching lines @@
                       0,
                       kStackOverflowRuntimeEntry);
   __ Bind(&no_stack_overflow);
 }
 
 
 void CodeGenerator::GenerateReturnEpilog(ReturnNode* node) {
   // Unchain the context(s) up to context level 0.
   int context_level = state()->context_level();
   ASSERT(context_level >= 0);
-  while (context_level-- > 0) {
-    __ movl(CTX, FieldAddress(CTX, Context::parent_offset()));
+  if (!parsed_function_.function().IsClosureFunction()) {
+    if (context_level > 0) {
+      // CTX on entry was saved on the stack, but not linked as context parent.
+      __ popl(CTX);
+    }
+  } else {
+    while (context_level-- > 0) {
+      __ movl(CTX, FieldAddress(CTX, Context::parent_offset()));
+    }
   }
 #ifdef DEBUG
   // Check that the entry stack size matches the exit stack size.
   __ movl(EDX, EBP);
   __ subl(EDX, ESP);
   ASSERT(locals_space_size() >= 0);
   __ cmpl(EDX, Immediate(locals_space_size()));
   Label wrong_stack;
   __ j(NOT_EQUAL, &wrong_stack, Assembler::kNearJump);
 #endif  // DEBUG.
@@ skipping 183 matching lines @@
   const intptr_t num_context_variables =
       (scope != NULL) ? scope->num_context_variables() : 0;
   if (num_context_variables > 0) {
     // The loop local scope declares variables that are captured.
     // Allocate and chain a new context.
     __ movl(EDX, Immediate(num_context_variables));
     const ExternalLabel label("alloc_context",
                               StubCode::AllocateContextEntryPoint());
     GenerateCall(node_sequence->token_index(), &label, PcDescriptors::kOther);
 
+    // If this node_sequence is the body of the function being compiled, and if
+    // this function is not a closure, do not link the current context as the
+    // parent of the newly allocated context, as it is not accessible. Instead,
+    // save it on the stack and restore it on exit.
+    if ((node_sequence == parsed_function_.node_sequence()) &&
+         !parsed_function_.function().IsClosureFunction()) {
+      __ pushl(CTX);
+      const Immediate raw_null =
+          Immediate(reinterpret_cast<intptr_t>(Object::null()));
+      __ movl(CTX, raw_null);
+    }
+
     // Chain the new context in EAX to its parent in CTX.
     __ StoreIntoObject(EAX, FieldAddress(EAX, Context::parent_offset()), CTX);
     // Set new context as current context.
     __ movl(CTX, EAX);
     state()->set_context_level(scope->context_level());
 
     // If this node_sequence is the body of the function being compiled, copy
     // the captured parameters from the frame into the context.
     if (node_sequence == parsed_function_.node_sequence()) {
       ASSERT(scope->context_level() == 1);
@@ skipping 25 matching lines @@
       (node_sequence == parsed_function_.node_sequence())) {
     GenerateArgumentTypeChecks();
   }
   for (int i = 0; i < node_sequence->length(); i++) {
     AstNode* child_node = node_sequence->NodeAt(i);
     state()->set_root_node(child_node);
     child_node->Visit(this);
   }
   if (num_context_variables > 0) {
     // Unchain the previously allocated context.
-    __ movl(CTX, FieldAddress(CTX, Context::parent_offset()));
+    if ((node_sequence == parsed_function_.node_sequence()) &&
+         !parsed_function_.function().IsClosureFunction()) {
+      __ popl(CTX);
+    } else {
+      __ movl(CTX, FieldAddress(CTX, Context::parent_offset()));
+    }
   }
   // If this node sequence is labeled, a break out of the sequence will have
   // taken care of unchaining the context.
   if (node_sequence->label() != NULL) {
     __ Bind(node_sequence->label()->break_label());
+    if ((num_context_variables > 0) &&
+        (node_sequence == parsed_function_.node_sequence()) &&
+         !parsed_function_.function().IsClosureFunction()) {
+      __ popl(CTX);
+    }
   }
 }
 
 
 void CodeGenerator::VisitArgumentListNode(ArgumentListNode* arguments) {
   for (int i = 0; i < arguments->length(); i++) {
     AstNode* argument = arguments->NodeAt(i);
     argument->Visit(this);
   }
 }
@@ skipping 1639 matching lines @@
   // and ':stacktrace_var' can never be captured variables.
   // Restore CTX from local variable ':saved_context'.
   GenerateLoadVariable(CTX, node->context_var());
 
   // Restore ESP from EBP as we are coming from a throw and the code for
   // popping arguments has not been run.
   ASSERT(locals_space_size() >= 0);
   __ movl(ESP, EBP);
   __ subl(ESP, Immediate(locals_space_size()));
 
+  if ((state()->context_level() > 0) &&
+      !parsed_function_.function().IsClosureFunction()) {
+    // CTX was saved on entry.
+    __ subl(ESP, Immediate(kWordSize));
+  }
+
   // The JumpToExceptionHandler trampoline code sets up
   // - the exception object in EAX (kExceptionObjectReg)
   // - the stacktrace object in register EDX (kStackTraceObjectReg)
   // We now setup the exception object and the trace object
   // so that the handler code has access to these objects.
   GenerateStoreVariable(node->exception_var(),
                         kExceptionObjectReg,
                         kNoRegister);
   GenerateStoreVariable(node->stacktrace_var(),
                         kStackTraceObjectReg,
@@ skipping 130 matching lines @@
   const Error& error = Error::Handle(
       Parser::FormatError(script, token_index, "Error", format, args));
   va_end(args);
   Isolate::Current()->long_jump_base()->Jump(1, error);
   UNREACHABLE();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32