| Index: runtime/vm/class_finalizer.h
|
| ===================================================================
|
| --- runtime/vm/class_finalizer.h (revision 1948)
|
| +++ runtime/vm/class_finalizer.h (working copy)
|
| @@ -10,13 +10,13 @@
|
|
|
| namespace dart {
|
|
|
| +class AbstractType;
|
| class Class;
|
| class Function;
|
| +class RawAbstractType;
|
| class RawClass;
|
| -class RawType;
|
| class Script;
|
| class String;
|
| -class Type;
|
| class TypeArguments;
|
| class UnresolvedClass;
|
|
|
| @@ -35,13 +35,14 @@
|
| // Return false if 'interface' conflicts with an interface already in the list
|
| // with the same class, but different type arguments.
|
| // In the case of a conflict, set 'conflicting' to the existing interface.
|
| - static bool AddInterfaceIfUnique(GrowableArray<Type*>* interface_list,
|
| - Type* interface,
|
| - Type* conflicting);
|
| + static bool AddInterfaceIfUnique(GrowableArray<AbstractType*>* interface_list,
|
| + AbstractType* interface,
|
| + AbstractType* conflicting);
|
|
|
| // Finalize and canonicalize type while parsing.
|
| // Set the error message on failure (to String::null() if no error).
|
| - static RawType* FinalizeAndCanonicalizeType(const Type& type, String* errmsg);
|
| + static RawAbstractType* FinalizeAndCanonicalizeType(
|
| + const AbstractType& type, String* errmsg);
|
|
|
| // Pending classes are classes that need to be finalized.
|
| static void AddPendingClasses(const GrowableArray<const Class*>& classes);
|
| @@ -77,8 +78,9 @@
|
| GrowableArray<const Class*>* visited);
|
| static void FinalizeTypeArguments(const Class& cls,
|
| const TypeArguments& arguments);
|
| - static RawType* ResolveType(const Class& cls, const Type& type);
|
| - static RawType* FinalizeType(const Type& type);
|
| + static RawAbstractType* ResolveType(
|
| + const Class& cls, const AbstractType& type);
|
| + static RawAbstractType* FinalizeType(const AbstractType& type);
|
| static void ResolveAndFinalizeUpperBounds(const Class& cls);
|
| static void VerifyUpperBounds(const Class& cls,
|
| const TypeArguments& arguments);
|
|
|