Update handling of ambiguous name references

runtime/lib/mirrors.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 "lib/invocation_mirror.h"
 #include "vm/bootstrap_natives.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_entry.h"
 #include "vm/exceptions.h"
 #include "vm/object_store.h"
@@ skipping 1193 matching lines @@
   GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(1));
   const Library& library = Library::Handle(ref.GetLibraryReferent());
   GET_NON_NULL_NATIVE_ARGUMENT(
       String, function_name, arguments->NativeArgAt(2));
   GET_NON_NULL_NATIVE_ARGUMENT(Array, args, arguments->NativeArgAt(3));
   GET_NON_NULL_NATIVE_ARGUMENT(Array, arg_names, arguments->NativeArgAt(4));
 
   const Array& args_descriptor_array =
       Array::Handle(ArgumentsDescriptor::New(args.Length(), arg_names));
 
-  String& ambiguity_error_msg = String::Handle(isolate);
   const Function& function = Function::Handle(
-      library.LookupFunctionAllowPrivate(function_name, &ambiguity_error_msg));
-
-  if (function.IsNull() && !ambiguity_error_msg.IsNull()) {
-    ThrowMirroredCompilationError(ambiguity_error_msg);
-    UNREACHABLE();
-  }
+      library.LookupFunctionAllowPrivate(function_name));
 
   ArgumentsDescriptor args_descriptor(args_descriptor_array);
   if (function.IsNull() ||
       !function.AreValidArguments(args_descriptor, NULL) ||
       !function.is_visible()) {
     ThrowNoSuchMethod(Instance::null_instance(),
                       function_name,
                       function,
                       InvocationMirror::kTopLevel,
                       InvocationMirror::kMethod);
@@ skipping 14 matching lines @@
   // Argument 0 is the mirror, which is unused by the native. It exists
   // because this native is an instance method in order to be polymorphic
   // with its cousins.
   GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(1));
   const Library& library = Library::Handle(ref.GetLibraryReferent());
   GET_NON_NULL_NATIVE_ARGUMENT(String, getter_name, arguments->NativeArgAt(2));
 
   // To access a top-level we may need to use the Field or the
   // getter Function.  The getter function may either be in the
   // library or in the field's owner class, depending.
-  String& ambiguity_error_msg = String::Handle(isolate);
   const Field& field = Field::Handle(
-      library.LookupFieldAllowPrivate(getter_name, &ambiguity_error_msg));
+      library.LookupFieldAllowPrivate(getter_name));
   Function& getter = Function::Handle();
-  if (field.IsNull() && ambiguity_error_msg.IsNull()) {
+  if (field.IsNull()) {
     // No field found and no ambiguity error.  Check for a getter in the lib.
     const String& internal_getter_name =
         String::Handle(Field::GetterName(getter_name));
-    getter = library.LookupFunctionAllowPrivate(internal_getter_name,
-                                                &ambiguity_error_msg);
+    getter = library.LookupFunctionAllowPrivate(internal_getter_name);
   } else if (!field.IsNull() && FieldIsUninitialized(field)) {
     // A field was found.  Check for a getter in the field's owner classs.
     const Class& klass = Class::Handle(field.owner());
     const String& internal_getter_name =
         String::Handle(Field::GetterName(getter_name));
     getter = klass.LookupStaticFunctionAllowPrivate(internal_getter_name);
   }
 
   if (!getter.IsNull() && getter.is_visible()) {
     // Invoke the getter and return the result.
     const Object& result = Object::Handle(
         DartEntry::InvokeFunction(getter, Object::empty_array()));
     if (result.IsError()) {
       ThrowInvokeError(Error::Cast(result));
       UNREACHABLE();
     }
     return result.raw();
   }
   if (!field.IsNull()) {
     return field.value();
   }
-  if (ambiguity_error_msg.IsNull()) {
-    ThrowNoSuchMethod(Instance::null_instance(),
-                      getter_name,
-                      getter,
-                      InvocationMirror::kTopLevel,
-                      InvocationMirror::kGetter);
-  } else {
-    ThrowMirroredCompilationError(ambiguity_error_msg);
-  }
+  ThrowNoSuchMethod(Instance::null_instance(),
+                    getter_name,
+                    getter,
+                    InvocationMirror::kTopLevel,
+                    InvocationMirror::kGetter);
   UNREACHABLE();
   return Instance::null();
 }
 
 
 DEFINE_NATIVE_ENTRY(LibraryMirror_invokeSetter, 4) {
   // Argument 0 is the mirror, which is unused by the native. It exists
   // because this native is an instance method in order to be polymorphic
   // with its cousins.
   GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(1));
   const Library& library = Library::Handle(ref.GetLibraryReferent());
   GET_NON_NULL_NATIVE_ARGUMENT(String, setter_name, arguments->NativeArgAt(2));
   GET_NATIVE_ARGUMENT(Instance, value, arguments->NativeArgAt(3));
 
   // To access a top-level we may need to use the Field or the
   // setter Function.  The setter function may either be in the
   // library or in the field's owner class, depending.
-  String& ambiguity_error_msg = String::Handle(isolate);
   const Field& field = Field::Handle(
-      library.LookupFieldAllowPrivate(setter_name, &ambiguity_error_msg));
+      library.LookupFieldAllowPrivate(setter_name));
 
-  if (field.IsNull() && ambiguity_error_msg.IsNull()) {
+  if (field.IsNull()) {
     const String& internal_setter_name =
         String::Handle(Field::SetterName(setter_name));
     const Function& setter = Function::Handle(
-        library.LookupFunctionAllowPrivate(internal_setter_name,
-                                           &ambiguity_error_msg));
+        library.LookupFunctionAllowPrivate(internal_setter_name));
     if (setter.IsNull() || !setter.is_visible()) {
-      if (ambiguity_error_msg.IsNull()) {
-        ThrowNoSuchMethod(Instance::null_instance(),
-                          setter_name,
-                          setter,
-                          InvocationMirror::kTopLevel,
-                          InvocationMirror::kSetter);
-      } else {
-        ThrowMirroredCompilationError(ambiguity_error_msg);
-      }
+      ThrowNoSuchMethod(Instance::null_instance(),
+                        setter_name,
+                        setter,
+                        InvocationMirror::kTopLevel,
+                        InvocationMirror::kSetter);
       UNREACHABLE();
     }
 
     // Invoke the setter and return the result.
     const int kNumArgs = 1;
     const Array& args = Array::Handle(Array::New(kNumArgs));
     args.SetAt(0, value);
     const Object& result = Object::Handle(
         DartEntry::InvokeFunction(setter, args));
     if (result.IsError()) {
@@ skipping 101 matching lines @@
 }
 
 
 DEFINE_NATIVE_ENTRY(VariableMirror_type, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(0));
   const Field& field = Field::Handle(ref.GetFieldReferent());
   return field.type();
 }
 
 }  // namespace dart