Fix bug with CHA dependencies by recording a set of classes for registering code.

runtime/vm/class_finalizer.cc

 // Copyright (c) 2013, 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.
 
 #include "vm/class_finalizer.h"
 
 #include "vm/code_generator.h"
 #include "vm/flags.h"
 #include "vm/heap.h"
 #include "vm/isolate.h"
@@ skipping 75 matching lines @@
     if (!super_type.IsMalformed() && super_type.HasResolvedTypeClass()) {
       cls ^= super_type.type_class();
       if (cls.is_finalized()) {
         AddSuperType(super_type, finalized_super_classes);
       }
     }
   }
 }
 
 
+static void CollectImmediateSuperInterfaces(
+    const Class& cls, GrowableArray<intptr_t>* cids) {
+  const Array& interfaces = Array::Handle(cls.interfaces());
+  Class& ifc = Class::Handle();
+  AbstractType& type = AbstractType::Handle();
+  for (intptr_t i = 0; i < interfaces.Length(); ++i) {
+    type ^= interfaces.At(i);
+    ifc ^= type.type_class();

[Vyacheslav Egorov (Google), 2014/08/13 11:40:28]

I wonder if you need to skip Malformed types here?

Superclass one does !super_type.IsMalformed() &&
super_type.HasResolvedTypeClass() check here.

[Florian Schneider, 2014/08/13 12:08:58]

Done.

+    for (intptr_t j = 0; j < cids->length(); ++j) {
+      if ((*cids)[j] == ifc.id()) {
+        // Already added.
+        return;
+      }
+    }
+    cids->Add(ifc.id());
+  }
+}
+
+
 // Processing ObjectStore::pending_classes_ occurs:
 // a) when bootstrap process completes (VerifyBootstrapClasses).
 // b) after the user classes are loaded (dart_api).
 bool ClassFinalizer::ProcessPendingClasses() {
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   HANDLESCOPE(isolate);
   ObjectStore* object_store = isolate->object_store();
   const Error& error = Error::Handle(isolate, object_store->sticky_error());
   if (!error.IsNull()) {
@@ skipping 2174 matching lines @@
   }
   if (FLAG_trace_class_finalization) {
     OS::Print("Finalize %s\n", cls.ToCString());
   }
   if (cls.IsMixinApplication()) {
     // Copy instance methods and fields from the mixin class.
     // This has to happen before the check whether the methods of
     // the class conflict with inherited methods.
     ApplyMixinMembers(cls);
   }
-  GrowableArray<intptr_t> added_subclass_to_cids;
-  CollectFinalizedSuperClasses(cls, &added_subclass_to_cids);
   // Ensure super class is finalized.
   const Class& super = Class::Handle(cls.SuperClass());
   if (!super.IsNull()) {
     FinalizeClass(super);
   }
   // Mark as parsed and finalized.
   cls.Finalize();
   // Mixin app alias classes may still lack their forwarding constructor.
   if (cls.is_mixin_app_alias() &&
       (cls.functions() == Object::empty_array().raw())) {
     const GrowableObjectArray& cloned_funcs =
         GrowableObjectArray::Handle(GrowableObjectArray::New());
     CreateForwardingConstructors(cls, cloned_funcs);
     const Array& functions = Array::Handle(Array::MakeArray(cloned_funcs));
     cls.SetFunctions(functions);
   }
   // Every class should have at least a constructor, unless it is a top level
   // class or a signature class.
   ASSERT(cls.IsTopLevel() ||
          cls.IsSignatureClass() ||
          (Array::Handle(cls.functions()).Length() > 0));
   // Resolve and finalize all member types.
   ResolveAndFinalizeMemberTypes(cls);
   // Run additional checks after all types are finalized.
   if (cls.is_const()) {
     CheckForLegalConstClass(cls);
   }
   if (FLAG_use_cha) {
-    RemoveCHAOptimizedCode(added_subclass_to_cids);
+    GrowableArray<intptr_t> cids;
+    CollectFinalizedSuperClasses(cls, &cids);
+    CollectImmediateSuperInterfaces(cls, &cids);
+    RemoveCHAOptimizedCode(cids);
   }
 }
 
 
 bool ClassFinalizer::IsSuperCycleFree(const Class& cls) {
   Class& test1 = Class::Handle(cls.raw());
   Class& test2 = Class::Handle(cls.SuperClass());
   // A finalized class has been checked for cycles.
   // Using the hare and tortoise algorithm for locating cycles.
   while (!test1.is_type_finalized() &&
@@ skipping 725 matching lines @@
   ASSERT(fields_array.Length() == ByteBuffer::NumberOfFields());
   field ^= fields_array.At(0);
   ASSERT(field.Offset() == ByteBuffer::data_offset());
   name ^= field.name();
   expected_name ^= String::New("_data");
   ASSERT(String::EqualsIgnoringPrivateKey(name, expected_name));
 #endif
 }
 
 }  // namespace dart