Chromium Code Reviews| Index: runtime/vm/resolver.cc |
| =================================================================== |
| --- runtime/vm/resolver.cc (revision 29568) |
| +++ runtime/vm/resolver.cc (working copy) |
| @@ -144,8 +144,7 @@ |
| const String& class_name, |
| const String& function_name, |
| intptr_t num_arguments, |
| - const Array& argument_names, |
| - StaticResolveType resolve_type) { |
| + const Array& argument_names) { |
| ASSERT(!library.IsNull()); |
| Function& function = Function::Handle(); |
| if (class_name.IsNull() || (class_name.Length() == 0)) { |
| @@ -181,8 +180,7 @@ |
| function = ResolveStatic(cls, |
| function_name, |
| num_arguments, |
| - argument_names, |
| - resolve_type); |
| + argument_names); |
| } |
| if (FLAG_trace_resolving && function.IsNull()) { |
| OS::Print("ResolveStatic error: function '%s.%s' not found.\n", |
| @@ -195,8 +193,7 @@ |
| RawFunction* Resolver::ResolveStaticByName(const Class& cls, |
| - const String& function_name, |
| - StaticResolveType resolve_type) { |
| + const String& function_name) { |
| ASSERT(!cls.IsNull()); |
| if (FLAG_trace_resolving) { |
| @@ -205,18 +202,7 @@ |
| // Now look for a static function whose name matches function_name |
| // in the class. |
| - Function& function = |
| - Function::Handle(cls.LookupStaticFunction(function_name)); |
| - if (resolve_type == kNotQualified) { |
| - // Walk the hierarchy. |
| - Class& super_class = Class::Handle(cls.SuperClass()); |
| - while (function.IsNull()) { |
| - function = super_class.LookupStaticFunction(function_name); |
| - super_class = super_class.SuperClass(); |
| - if (super_class.IsNull()) break; |
| - } |
| - } |
| - return function.raw(); |
| + return cls.LookupStaticFunction(function_name); |
|
regis
2013/10/31 18:48:42
ResolveStaticByName is now just a redirect and it
siva
2013/10/31 20:08:41
I removed the function, PTAL.
On 2013/10/31 18:48
|
| } |
| @@ -224,11 +210,10 @@ |
| RawFunction* Resolver::ResolveStatic(const Class& cls, |
| const String& function_name, |
| intptr_t num_arguments, |
| - const Array& argument_names, |
| - StaticResolveType resolve_type) { |
| + const Array& argument_names) { |
| ASSERT(!cls.IsNull()); |
| - const Function& function = Function::Handle( |
| - ResolveStaticByName(cls, function_name, resolve_type)); |
| + const Function& function = |
| + Function::Handle(ResolveStaticByName(cls, function_name)); |
| if (function.IsNull() || |
| !function.AreValidArguments(num_arguments, argument_names, NULL)) { |
| // Return a null function to signal to the upper levels to throw a |