Fix issue 18435 (2nd attempt).

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 373 matching lines @@
 
 
 void AstPrinter::PrintNode(AstNode* node) {
   ASSERT(node != NULL);
   AstPrinter ast_printer;
   node->Visit(&ast_printer);
   OS::Print("\n");
 }
 
 
+void AstPrinter::PrintLocalScopeVariable(const LocalScope* scope,
+                                         LocalVariable* var) {
+  ASSERT(scope != NULL);
+  ASSERT(var != NULL);
+  OS::Print("(%s%s '%s'",
+            var->is_final() ? "final " : "",
+            String::Handle(var->type().Name()).ToCString(),
+            var->name().ToCString());
+  if (var->owner() != scope) {
+    OS::Print(" alias");
+  }
+  if (var->HasIndex()) {
+    OS::Print(" @%d", var->index());
+    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 %" Pd "-%" Pd ")",
+            var->token_pos(),
+            scope->end_token_pos());
+}
+
+
 void AstPrinter::PrintLocalScope(const LocalScope* scope,
                                  int start_index) {
   ASSERT(scope != NULL);
   for (int i = start_index; i < scope->num_variables(); i++) {
     LocalVariable* var = scope->VariableAt(i);
-    OS::Print("(%s%s '%s'",
-              var->is_final() ? "final " : "",
-              String::Handle(var->type().Name()).ToCString(),
-              var->name().ToCString());
-    if (var->owner() != scope) {
-      OS::Print(" alias");
-    }
-    if (var->HasIndex()) {
-      OS::Print(" @%d", var->index());
-      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 %" Pd "-%" Pd ")",
-              var->token_pos(),
-              scope->end_token_pos());
+    PrintLocalScopeVariable(scope, var);
   }
   const LocalScope* child = scope->child();
   while (child != NULL) {
     OS::Print("{scope %p ", child);
     if (child->HasContextLevel()) {
       OS::Print("ctx %d numctxvar %d ",
                 child->context_level(),
                 child->num_context_variables());
     }
     OS::Print("llev %d ", child->loop_level());
@@ skipping 21 matching lines @@
               scope->num_context_variables());
   }
   OS::Print("llev %d ", scope->loop_level());
   const int num_fixed_params = function.num_fixed_parameters();
   const int num_params = num_fixed_params + function.NumOptionalParameters();
   // 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);
+    ASSERT(param->owner() == scope);  // No aliases should precede parameters.
     OS::Print("(param %s%s '%s'",
               param->is_final() ? "final " : "",
               String::Handle(param->type().Name()).ToCString(),
               param->name().ToCString());
     // Print the default value if the parameter is optional.
     if (pos >= num_fixed_params && pos < num_params) {
       const Object& default_parameter_value = Object::Handle(
           default_parameter_values.At(pos - num_fixed_params));
       OS::Print(" =%s", default_parameter_value.ToCString());
     }
@@ skipping 20 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