Clean-up CodeGenState: remove unused loop_level and move context_level to CodeGenerator (and add it…

runtime/vm/flow_graph_builder.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/flow_graph_builder.h"
 
 #include "vm/ast_printer.h"
 #include "vm/flags.h"
 #include "vm/intermediate_language.h"
 #include "vm/longjump.h"
@@ skipping 1243 matching lines @@
                                                  for_index.value(),
                                                  for_value.value());
   ReturnComputation(store);
 }
 
 
 // <Statement> ::= Sequence { scope: LocalScope
 //                            nodes: <Statement>*
 //                            label: SourceLabel }
 void EffectGraphVisitor::VisitSequenceNode(SequenceNode* node) {
+  LocalScope* scope = node->scope();
+  const intptr_t num_context_variables =
+      (scope != NULL) ? scope->num_context_variables() : 0;
+  int previous_context_level = owner()->context_level();
+  if (num_context_variables > 0) {
+    // The loop local scope declares variables that are captured.
+    // Allocate and chain a new context.
+    // Allocate context computation

[regis, 2012/03/15 23:39:07]

period

[srdjan, 2012/03/15 23:45:41]

Done.

+    // Chain Context computation (maybe introduce a new variable).
+    Bailout("Sequence needs a context.  Gotta have a context.");
+  }
+
   if (FLAG_enable_type_checks &&
       (node == owner()->parsed_function().node_sequence())) {
     Bailout("VisitSequenceNode GenerateArgumentTypeChecks()");
   }
-  if ((node->scope() != NULL) &&
-      (node->scope()->num_context_variables() != 0)) {
-    Bailout("Sequence needs a context.  Gotta have a context.");
-  }
+
   intptr_t i = 0;
   while (is_open() && (i < node->length())) {
     EffectGraphVisitor for_effect(owner(), temp_index());
     node->NodeAt(i++)->Visit(&for_effect);
     Append(for_effect);
   }
+  owner()->set_context_level(previous_context_level);
 }
 
 
 void EffectGraphVisitor::VisitCatchClauseNode(CatchClauseNode* node) {
   Bailout("EffectGraphVisitor::VisitCatchClauseNode");
 }
 
 
 void EffectGraphVisitor::VisitTryCatchNode(TryCatchNode* node) {
   Bailout("EffectGraphVisitor::VisitTryCatchNode");
@@ skipping 386 matching lines @@
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len));
   OS::SNPrint(chars, len, kFormat, function_name, reason);
   const Error& error = Error::Handle(
       LanguageError::New(String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart