| Index: runtime/vm/class_finalizer.h
|
| ===================================================================
|
| --- runtime/vm/class_finalizer.h (revision 24923)
|
| +++ runtime/vm/class_finalizer.h (working copy)
|
| @@ -32,7 +32,7 @@
|
| enum FinalizationKind {
|
| kIgnore, // Type is ignored and replaced by dynamic.
|
| kDoNotResolve, // Type resolution is postponed.
|
| - kTryResolve, // Type resolution is attempted.
|
| + kResolveTypeParameters, // Resolve type parameters only.
|
| kFinalize, // Type resolution and type finalization are
|
| // required; a malformed type is tolerated, since
|
| // the type may be used as a type annotation.
|
| @@ -97,7 +97,8 @@
|
| GrowableArray<intptr_t>* visited);
|
| static void CheckForLegalConstClass(const Class& cls);
|
| static RawClass* ResolveClass(const Class& cls,
|
| - const UnresolvedClass& unresolved_class);
|
| + const UnresolvedClass& unresolved_class,
|
| + Error* ambiguity_error);
|
| static void ResolveRedirectingFactoryTarget(
|
| const Class& cls,
|
| const Function& factory,
|
|
|