Fix context unchaining (issue 5991015).

runtime/vm/ast_printer.cc

 // Copyright (c) 2011, 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/ast_printer.h"
 
 #include "vm/handles.h"
 #include "vm/object.h"
 #include "vm/os.h"
 #include "vm/parser.h"
@@ skipping 12 matching lines @@
   OS::Print(")");
 }
 
 
 void AstPrinter::VisitSequenceNode(SequenceNode* node_sequence) {
   // TODO(regis): Make the output more readable by indenting the nested
   // sequences. This could be achieved using a AstPrinterContext similar to the
   // CodeGeneratorContext.
   ASSERT(node_sequence != NULL);
   for (int i = 0; i < node_sequence->length(); i++) {
-    OS::Print("id %d: ",  node_sequence->NodeAt(i)->id());
+    OS::Print("id %d, scope 0x%x: ",
+              node_sequence->NodeAt(i)->id(),
+              node_sequence->scope());
     node_sequence->NodeAt(i)->Visit(this);
     OS::Print("\n");
   }
 }
 
 
 void AstPrinter::VisitCloneContextNode(CloneContextNode* node) {
   VisitGenericAstNode(node);
 }
 
@@ skipping 188 matching lines @@
 void AstPrinter::VisitDoWhileNode(DoWhileNode* node) {
   OS::Print("(do ");
   node->body()->Visit(this);
   OS::Print(" while ");
   node->condition()->Visit(this);
   OS::Print(")");
 }
 
 
 void AstPrinter::VisitJumpNode(JumpNode* node) {
-  OS::Print("(%s %s)", node->Name(), node->label()->name().ToCString());
+  OS::Print("(%s %s in scope 0x%x)",
+            node->Name(),
+            node->label()->name().ToCString(),
+            node->label()->owner());
 }
 
 
 void AstPrinter::VisitIncrOpLocalNode(IncrOpLocalNode* node) {
   VisitGenericLocalNode(node, node->local());
 }
 
 
 void AstPrinter::VisitIncrOpInstanceFieldNode(IncrOpInstanceFieldNode* node) {
   VisitGenericAstNode(node);
@@ skipping 161 matching lines @@
       if (var->is_captured()) {
         OS::Print(" ctx %d", var->owner()->context_level());
       }
     } else if (var->owner()->function_level() != 0) {
       OS::Print(" lev %d", var->owner()->function_level());
     }
     OS::Print(" valid %d-%d)", var->token_index(), scope->end_token_index());
   }
   const LocalScope* child = scope->child();
   while (child != NULL) {
-    OS::Print("{scope ");
+    OS::Print("{scope 0x%x ", child);
+    if (child->HasContextLevel()) {
+      OS::Print("ctx %d numctxvar %d ",
+                child->context_level(),
+                child->num_context_variables());
+    }
+    OS::Print("llev %d ", child->loop_level());
     PrintLocalScope(child, 0);
     OS::Print("}");
     child = child->sibling();
   }
 }
 
 
 void AstPrinter::PrintFunctionScope(const ParsedFunction& parsed_function) {
   HANDLESCOPE(Isolate::Current());
   const Function& function = parsed_function.function();
   const Array& default_parameter_values =
       parsed_function.default_parameter_values();
   SequenceNode* node_sequence = parsed_function.node_sequence();
   ASSERT(node_sequence != NULL);
   const LocalScope* scope = node_sequence->scope();
   ASSERT(scope != NULL);
   const char* function_name = function.ToFullyQualifiedCString();
-  OS::Print("Scope for function '%s' {\n", function_name);
+  OS::Print("Scope for function '%s' {scope 0x%x ", function_name, scope);
+  if (scope->HasContextLevel()) {
+    OS::Print("ctx %d numctxvar %d ",
+              scope->context_level(),
+              scope->num_context_variables());
+  }
+  OS::Print("llev %d ", scope->loop_level());
   const int num_fixed_params = function.num_fixed_parameters();
   const int num_opt_params = function.num_optional_parameters();
   const int num_params = num_fixed_params + num_opt_params;
   // Parameters must be listed first and must all appear in the top scope.
   ASSERT(num_params <= scope->num_variables());
   int pos = 0;  // Current position of variable in scope.
   while (pos < num_params) {
     LocalVariable* param = scope->VariableAt(pos);
     ASSERT(param->owner() == scope);
     OS::Print("(param %s%s '%s'",
@@ skipping 27 matching lines @@
   ASSERT(node_sequence != NULL);
   AstPrinter ast_printer;
   const char* function_name =
       parsed_function.function().ToFullyQualifiedCString();
   OS::Print("Ast for function '%s' {\n", function_name);
   node_sequence->Visit(&ast_printer);
   OS::Print("}\n");
 }
 
 }  // namespace dart