Include super type in interface list for cycle detection (issue 4318).

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 77 matching lines @@
   static void VerifyBootstrapClasses();
 
  private:
   static void FinalizeClass(const Class& cls);
   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);
-  static void ResolveSuperType(const Class& cls);
   static void ResolveRedirectingFactoryTarget(
       const Class& cls,
       const Function& factory,
       const GrowableObjectArray& visited_factories);
-  static void ResolveInterfaces(const Class& cls,
-                                GrowableArray<intptr_t>* visited);
+  static void ResolveSuperTypeAndInterfaces(const Class& cls,
+                                            GrowableArray<intptr_t>* visited);
   static void FinalizeTypeParameters(const Class& cls);
   static void FinalizeTypeArguments(const Class& cls,
                                     const AbstractTypeArguments& arguments,
                                     FinalizationKind finalization);
   static void ResolveType(const Class& cls,
                           const AbstractType& type,
                           FinalizationKind finalization);
   static void ResolveAndFinalizeUpperBounds(const Class& cls);
   static void ResolveAndFinalizeSignature(const Class& cls,
                                           const Function& function);
@@ skipping 10 matching lines @@
   static void ReportError(const Error& error);
   static void ReportError(const Script& script,
                           intptr_t token_index,
                           const char* format, ...) PRINTF_ATTRIBUTE(3, 4);
   static void ReportError(const char* format, ...) PRINTF_ATTRIBUTE(1, 2);
 };
 
 }  // namespace dart
 
 #endif  // VM_CLASS_FINALIZER_H_