Fix code generation issue with new factory syntax.

runtime/vm/parser.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/parser.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/compiler_stats.h"
@@ skipping 581 matching lines @@
 
   if ((node_sequence->length() == 0) ||
       !node_sequence->NodeAt(node_sequence->length() - 1)->IsReturnNode()) {
     // Add implicit return node.
     node_sequence->Add(new ReturnNode(parser.token_index_));
   }
   parsed_function->set_node_sequence(node_sequence);
 
   // The instantiator may be required at run time for generic type checks or
   // allocation of generic types.
-  if ((parser.current_class().NumTypeParameters() > 0) &&
-      (!parser.current_function().is_static() ||
-       parser.current_function().IsInFactoryScope())) {
+  if (parser.IsInstantiatorRequired()) {
     // In the case of a local function, only set the instantiator if the
     // receiver was captured.
     const bool kTestOnly = true;
     LocalVariable* receiver =
         parser.LookupReceiver(node_sequence->scope(),
                               kTestOnly);
     if (!parser.current_function().IsLocalFunction() ||
         ((receiver != NULL) && receiver->is_captured())) {
       parsed_function->set_instantiator(
           new LoadLocalNode(node_sequence->token_index(), *receiver));
@@ skipping 1205 matching lines @@
       }
     }
   }
   // Populate function scope with the formal parameters.
   AddFormalParamsToScope(&params, current_block_->scope);
 
   if (FLAG_enable_type_checks &&
       (current_block_->scope->function_level() > 0)) {
     // We are parsing, but not compiling, a local function.
     // The instantiator may be required at run time for generic type checks.
-    if ((current_class().NumTypeParameters() > 0) &&
-        (!current_function().is_static() ||
-         current_function().IsInFactoryScope())) {
+    if (IsInstantiatorRequired()) {
       // Make sure that the receiver of the enclosing instance function
       // (or implicit first parameter of an enclosing factory) is marked as
       // captured if type checks are enabled, because they may access the
       // receiver to instantiate types.
       CaptureReceiver();
     }
   }
 
   if (CurrentToken() == Token::kLBRACE) {
     ConsumeToken();
@@ skipping 4218 matching lines @@
       }
       if (!outer_function.is_static()) {
         return current_class().raw();
       }
     }
   }
   return Class::null();
 }
 
 
+bool Parser::IsInstantiatorRequired() {

[srdjan, 2011/11/18 17:42:30]

Can this method be const?

[regis, 2011/11/18 17:45:46]

Yes. Done.

+  ASSERT(!current_function().IsNull());
+  Function& outer_function = Function::Handle(current_function().raw());
+  while (outer_function.IsLocalFunction()) {
+    outer_function = outer_function.parent_function();
+  }
+  if (outer_function.IsFactory()) {
+    const Class& signature_class =
+        Class::Handle(outer_function.signature_class());
+    return signature_class.NumTypeParameters() > 0;
+  }
+  if (!outer_function.is_static()) {
+    return current_class().NumTypeParameters() > 0;
+  }
+  return false;
+}
+
+
 void Parser::RunStaticFieldInitializer(const Field& field) {
   ASSERT(field.is_static());
   const Instance& value = Instance::Handle(field.value());
   if (value.raw() == Object::transition_sentinel()) {
     ErrorMsg("circular dependency while initializing static field '%s'",
              String::Handle(field.name()).ToCString());
 
   } else if (value.raw() == Object::sentinel()) {
     // This field has not been referenced yet and thus the value has
     // not been evaluated. Call the static getter method to evaluate
@@ skipping 1281 matching lines @@
 }
 
 
 void Parser::SkipNestedExpr() {
   const bool saved_mode = SetAllowFunctionLiterals(true);
   SkipExpr();
   SetAllowFunctionLiterals(saved_mode);
 }
 
 }  // namespace dart