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

runtime/vm/find_code_object_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/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/object.h"
 #include "vm/pages.h"
 #include "vm/stack_frame.h"
@@ skipping 35 matching lines @@
                 "static foo%d([int i=1,int j=2,int k=3]){return i+j+k;}", i);
     written += OS::SNPrint((scriptChars + written),
                            (kScriptSize - written),
                            "%s",
                            buffer);
   }
   OS::SNPrint((scriptChars + written), (kScriptSize - written), "}");
   source = String::New(scriptChars);
   script = Script::New(url, source, RawScript::kScriptTag);
   EXPECT(CompilerTest::TestCompileScript(lib, script));
-  clsA = lib.LookupClass(String::Handle(Symbols::New("A")));
+  String& ambiguity_error_msg = String::Handle();
+  clsA = lib.LookupClass(String::Handle(Symbols::New("A")),
+                         &ambiguity_error_msg);
   EXPECT(!clsA.IsNull());
   ClassFinalizer::FinalizePendingClasses();
   for (int i = 0; i < kNumFunctions; i++) {
     OS::SNPrint(buffer, 256, "foo%d", i);
     function_name = String::New(buffer);
     function = clsA.LookupStaticFunction(function_name);
     EXPECT(!function.IsNull());
     EXPECT(CompilerTest::TestCompileFunction(function));
     EXPECT(function.HasCode());
   }
@@ skipping 27 matching lines @@
     written += OS::SNPrint((scriptChars + written),
                            (kScriptSize - written),
                            "%s",
                            buffer);
   }
   OS::SNPrint((scriptChars + written), (kScriptSize - written), "}");
   url = String::New("dart-test:FindCodeObject");
   source = String::New(scriptChars);
   script = Script::New(url, source, RawScript::kScriptTag);
   EXPECT(CompilerTest::TestCompileScript(lib, script));
-  clsB = lib.LookupClass(String::Handle(Symbols::New("B")));
+  clsB = lib.LookupClass(String::Handle(Symbols::New("B")),
+                         &ambiguity_error_msg);
   EXPECT(!clsB.IsNull());
   ClassFinalizer::FinalizePendingClasses();
   for (int i = 0; i < kNumFunctions; i++) {
     OS::SNPrint(buffer, 256, "moo%d", i);
     function_name = String::New(buffer);
     function = clsB.LookupStaticFunction(function_name);
     EXPECT(!function.IsNull());
     EXPECT(CompilerTest::TestCompileFunction(function));
     EXPECT(function.HasCode());
   }
@@ skipping 36 matching lines @@
 #else
   EXPECT(code.Size() > PageSpace::kPageSize);
   EXPECT(Code::LookupCode(pc) == code.raw());
   EXPECT(code.Size() > (1 * MB));
   pc = code.EntryPoint() + (1 * MB);
   EXPECT(Code::LookupCode(pc) == code.raw());
 #endif  // defined(TARGET_ARCH_MIPS)
 }
 
 }  // namespace dart