Fix access to type variables in initializer expressions

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 "lib/invocation_mirror.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
@@ skipping 5039 matching lines @@
 
 LocalVariable* Parser::LookupPhaseParameter() {
   const bool kTestOnly = false;
   return current_block_->scope->LookupVariable(Symbols::PhaseParameter(),
                                                kTestOnly);
 }
 
 
 void Parser::CaptureInstantiator() {
   ASSERT(current_block_->scope->function_level() > 0);
-  const bool kTestOnly = false;
-  // Side effect of lookup captures the instantiator variable.
-  LocalVariable* instantiator = NULL;
   if (current_function().IsInFactoryScope()) {
-    instantiator = LookupTypeArgumentsParameter(current_block_->scope,
-                                                kTestOnly);
+    current_block_->scope->CaptureVariable(Symbols::TypeArgumentsParameter());
   } else {
-    instantiator = LookupReceiver(current_block_->scope, kTestOnly);
+    current_block_->scope->CaptureVariable(Symbols::This());
   }
-  ASSERT(instantiator != NULL);
 }
 
 
 AstNode* Parser::LoadReceiver(intptr_t token_pos) {
   // A nested function may access 'this', referring to the receiver of the
   // outermost enclosing function.
   const bool kTestOnly = false;
   LocalVariable* receiver = LookupReceiver(current_block_->scope, kTestOnly);
   if (receiver == NULL) {
     ErrorMsg(token_pos, "illegal implicit access to receiver 'this'");
@@ skipping 5193 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart