Refactor resolution code in the vm to properly handle ambiguity errors.

runtime/vm/code_generator_test.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 "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/ast.h"
 #include "vm/assembler.h"
 #include "vm/class_finalizer.h"
 #include "vm/code_generator.h"
@@ skipping 254 matching lines @@
   ASSERT(!core_lib.IsNull());
   const Namespace& core_ns = Namespace::Handle(
       Namespace::New(core_lib, Array::Handle(), Array::Handle()));
   lib.AddImport(core_ns);
   return lib;
 }
 
 
 static RawClass* LookupClass(const Library& lib, const char* name) {
   const String& cls_name = String::ZoneHandle(Symbols::New(name));
-  return lib.LookupClass(cls_name);
+  return lib.LookupClass(cls_name, NULL);
 }

[siva, 2013/07/22 22:21:46]

Ditto case here in the places where LookupClass is used.

[regis, 2013/07/22 23:51:27]

Done.

 
 
 CODEGEN_TEST_GENERATE(StaticCallCodegen, test) {
   const char* kScriptChars =
       "class A {\n"
       "  static bar() { return 42; }\n"
       "  static fly() { return 5; }\n"
       "}\n";
 
   String& url = String::Handle(String::New("dart-test:CompileScript"));
@@ skipping 258 matching lines @@
   EXPECT(!result.IsError());
   const GrowableObjectArray& libs =  GrowableObjectArray::Handle(
       Isolate::Current()->object_store()->libraries());
   ASSERT(!libs.IsNull());
   // App lib is the last one that was loaded.
   intptr_t num_libs = libs.Length();
   Library& app_lib = Library::Handle();
   app_lib ^= libs.At(num_libs - 1);
   ASSERT(!app_lib.IsNull());
   const Class& cls = Class::Handle(
-      app_lib.LookupClass(String::Handle(Symbols::New("A"))));
+      app_lib.LookupClass(String::Handle(Symbols::New("A")), NULL));
   EXPECT_EQ(cls.raw(), result.clazz());
 }
 
 }  // namespace dart