Fix bug 6713

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 5017 matching lines @@
   Array& default_parameter_values = Array::Handle();
   SequenceNode* statements = Parser::ParseFunc(function,
                                                default_parameter_values);
   ASSERT(is_new_closure || (function.end_token_pos() == TokenPos()));
   function.set_end_token_pos(TokenPos());
 
   // Now that the local function has formal parameters, lookup the signature
   // class in the current library (but not in its imports) and only create a new
   // canonical signature class if it does not exist yet.
   const String& signature = String::Handle(function.Signature());
-  Class& signature_class = Class::ZoneHandle(
-      library_.LookupLocalClass(signature));
-
+  Class& signature_class = Class::ZoneHandle(function.signature_class());
+  if (signature_class.IsNull()) {

[regis, 2012/11/19 19:20:32]

ASSERT(is_new_closure);
or you could set the signature_class to function.signature_class() only if
!is_new_closure:

Class& signature_class = Class::ZoneHandle();
if (!is_new_closure) {
  signature_class = function.signature_class();
}

[hausner, 2012/11/19 21:35:04]

Done.

+    signature_class = library_.LookupLocalClass(signature);
+  }
   if (signature_class.IsNull()) {
     // If we don't have a signature class yet, this must be a closure we
     // have not parsed before.
     ASSERT(is_new_closure);
     signature_class = Class::NewSignatureClass(signature,
                                                function,
                                                script_);
     // Record the function signature class in the current library.
     library_.AddClass(signature_class);
   } else if (is_new_closure) {
@@ skipping 4980 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart