Fix argument definition test (issue 4888).

runtime/vm/parser.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/parser.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/compiler_stats.h"
@@ skipping 8910 matching lines @@
     return new LiteralNode(test_pos, Bool::ZoneHandle(Bool::True()));
   }
   char name[64];
   OS::SNPrint(name, 64, "%s_%d",
               Symbols::Name(Symbols::kSavedArgDescVarPrefix),
               owner_function.token_pos());
   const String& saved_args_desc_name = String::ZoneHandle(Symbols::New(name));
   LocalVariable* saved_args_desc_var = LookupLocalScope(saved_args_desc_name);
   if (saved_args_desc_var == NULL) {
     ASSERT(owner_scope != NULL);
-    ASSERT(owner_function.raw() == current_function().raw());
-    // We currently generate code for 'owner_function', otherwise the variable
-    // would have been created when compiling the enclosing function of the
-    // currently being compiled local function.
     saved_args_desc_var =
         new LocalVariable(owner_function.token_pos(),
                           saved_args_desc_name,
                           Type::ZoneHandle(Type::ListInterface()));
     saved_args_desc_var->set_is_final();
     // The saved arguments descriptor variable must be added just after the
     // formal parameters. This simplifies the 2-step saving of a captured
     // arguments descriptor.
     // At this time, the owner scope should only contain formal parameters.
     ASSERT(owner_scope->num_variables() == owner_function.NumberOfParameters());
     bool success = owner_scope->AddVariable(saved_args_desc_var);
     ASSERT(success);
     // Capture the saved argument descriptor variable if necessary.
-    if (current_function().raw() != innermost_function().raw()) {
-      LocalVariable* local = LookupLocalScope(saved_args_desc_name);
-      ASSERT(local == saved_args_desc_var);
-      ASSERT(local->is_captured());
-    }
-  } else {
-    // If we currently generate code for a local function of the owner function,
-    // the saved arguments descriptor variable must have been captured by the
-    // above lookup.
-    ASSERT((owner_function.raw() == current_function().raw()) ||
-           saved_args_desc_var->is_captured());
+    LocalVariable* local = LookupLocalScope(saved_args_desc_name);
+    ASSERT(local == saved_args_desc_var);
   }
+  // If we currently generate code for the local function of an enclosing owner
+  // function, the saved arguments descriptor variable must have been captured
+  // by the above lookup.
+  ASSERT((owner_function.raw() == innermost_function().raw()) ||
+         saved_args_desc_var->is_captured());
   const String& param_name = String::ZoneHandle(Symbols::New(*ident));
   return new ArgumentDefinitionTestNode(
       test_pos, param_index, param_name, saved_args_desc_var);
 }
 
 
 AstNode* Parser::ParsePrimary() {
   TRACE_PARSER("ParsePrimary");
   ASSERT(!is_top_level_);
   AstNode* primary = NULL;
@@ skipping 407 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart