Stop resolving classes prematurely in the vm (issue 11023).

runtime/vm/class_finalizer.h

 // 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.
 
 #ifndef VM_CLASS_FINALIZER_H_
 #define VM_CLASS_FINALIZER_H_
 
 #include "vm/allocation.h"
 #include "vm/growable_array.h"
 
@@ skipping 14 matching lines @@
 class UnresolvedClass;
 
 // Traverses all pending, unfinalized classes, validates and marks them as
 // finalized.
 class ClassFinalizer : public AllStatic {
  public:
   // Modes for type resolution and finalization. The ordering is relevant.
   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.
     kCanonicalize,             // Same as kFinalize, but with canonicalization.
     kCanonicalizeExpression,   // Same as kCanonicalize, but do not tolerate
                                // wrong number of type arguments or ambiguous
                                // type reference, since the type is not used as
                                // a type annotation, but as a type expression.
     kCanonicalizeWellFormed    // Error-free resolution, finalization, and
                                // canonicalization are required; a malformed
@@ skipping 44 matching lines @@
   // Verify that the classes have been properly prefinalized. This is
   // needed during bootstrapping where the classes have been preloaded.
   static void VerifyBootstrapClasses();
 
  private:
   static bool IsSuperCycleFree(const Class& cls);
   static bool IsAliasCycleFree(const Class& cls,
                                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,
       const GrowableObjectArray& visited_factories);
   static void CloneTypeParameters(const Class& mixapp_class);
   static void ApplyMixinTypes(const Class& cls);
   static void ApplyMixin(const Class& cls);
   static void CollectTypeArguments(const Class& cls,
                                    const Type& type,
                                    const GrowableObjectArray& collected_args);
@@ skipping 33 matching lines @@
   static void ReportError(const char* format, ...) PRINTF_ATTRIBUTE(1, 2);
 
   // Verify implicit offsets recorded in the VM for direct access to fields of
   // Dart instances (e.g: _TypedListView, _ByteDataView).
   static void VerifyImplicitFieldOffsets();
 };
 
 }  // namespace dart
 
 #endif  // VM_CLASS_FINALIZER_H_