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

runtime/vm/cha_test.cc

Index: runtime/vm/cha_test.cc
===================================================================
--- runtime/vm/cha_test.cc	(revision 39070)
+++ runtime/vm/cha_test.cc	(working copy)
@@ -76,59 +76,22 @@
       Function::Handle(class_d.LookupDynamicFunction(function_bar_name));
   EXPECT(!class_d_bar.IsNull());
 
-  ZoneGrowableArray<intptr_t>* a_subclass_ids =
-      CHA::GetSubclassIdsOf(class_a_id);
-  EXPECT_EQ(3, a_subclass_ids->length());
-  EXPECT_EQ(class_b_id, (*a_subclass_ids)[0]);
-  EXPECT_EQ(class_c_id, (*a_subclass_ids)[1]);
-  EXPECT_EQ(class_d_id, (*a_subclass_ids)[2]);
-  ZoneGrowableArray<intptr_t>* b_subclass_ids =
-      CHA::GetSubclassIdsOf(class_b_id);
-  EXPECT_EQ(1, b_subclass_ids->length());
-  EXPECT_EQ(class_c_id, (*b_subclass_ids)[0]);
-  ZoneGrowableArray<intptr_t>* c_subclass_ids =
-      CHA::GetSubclassIdsOf(class_c_id);
-  EXPECT_EQ(0, c_subclass_ids->length());
-  ZoneGrowableArray<intptr_t>* d_subclass_ids =
-      CHA::GetSubclassIdsOf(class_d_id);
-  EXPECT_EQ(0, d_subclass_ids->length());
+  CHA cha(Isolate::Current());
 
-  ZoneGrowableArray<Function*>* foos =
-      CHA::GetNamedInstanceFunctionsOf(*a_subclass_ids, function_foo_name);
-  EXPECT_EQ(2, foos->length());
-  EXPECT_EQ(class_c_foo.raw(), (*foos)[0]->raw());
-  EXPECT_EQ(class_d_foo.raw(), (*foos)[1]->raw());
+  EXPECT(cha.HasSubclasses(kInstanceCid));
+  EXPECT(!cha.HasSubclasses(kSmiCid));
+  EXPECT(!cha.HasSubclasses(kNullCid));
+  EXPECT(!cha.HasSubclasses(kDynamicCid));
+  EXPECT(!cha.HasSubclasses(kVoidCid));
+  EXPECT(cha.HasSubclasses(class_a_id));
+  EXPECT(cha.HasSubclasses(class_b_id));
+  EXPECT(!cha.HasSubclasses(class_c_id));
+  EXPECT(!cha.HasSubclasses(class_d_id));

[Vyacheslav Egorov (Google), 2014/08/12 12:16:55]

You should also test if list of classes were collected correctly.

[Florian Schneider, 2014/08/13 10:34:40]

Done.

 
-  ZoneGrowableArray<Function*>* class_a_foo_overrides =
-      CHA::GetOverridesOf(class_a_foo);
-  EXPECT_EQ(2, class_a_foo_overrides->length());
-  EXPECT_EQ(class_c_foo.raw(), (*class_a_foo_overrides)[0]->raw());
-  EXPECT_EQ(class_d_foo.raw(), (*class_a_foo_overrides)[1]->raw());
-
-  ZoneGrowableArray<Function*>* bars =
-      CHA::GetNamedInstanceFunctionsOf(*a_subclass_ids, function_bar_name);
-  EXPECT_EQ(1, bars->length());
-  EXPECT_EQ(class_d_bar.raw(), (*bars)[0]->raw());
-
-  ZoneGrowableArray<Function*>* class_a_bar_overrides =
-      CHA::GetOverridesOf(class_a_bar);
-  EXPECT_EQ(1, class_a_bar_overrides->length());
-  EXPECT_EQ(class_d_bar.raw(), (*class_a_bar_overrides)[0]->raw());
-
-  EXPECT(CHA::HasSubclasses(kInstanceCid));
-  EXPECT(!CHA::HasSubclasses(kSmiCid));
-  EXPECT(!CHA::HasSubclasses(kNullCid));
-  EXPECT(!CHA::HasSubclasses(kDynamicCid));
-  EXPECT(!CHA::HasSubclasses(kVoidCid));
-  EXPECT(CHA::HasSubclasses(class_a_id));
-  EXPECT(CHA::HasSubclasses(class_b_id));
-  EXPECT(!CHA::HasSubclasses(class_c_id));
-  EXPECT(!CHA::HasSubclasses(class_d_id));
-
   class Class& function_impl_class =
       Class::Handle(Type::Handle(Isolate::Current()->object_store()->
           function_impl_type()).type_class());
-  EXPECT(CHA::HasSubclasses(function_impl_class.id()));
+  EXPECT(cha.HasSubclasses(function_impl_class.id()));
 }
 
 }  // namespace dart