Some cleanup and be more conservative when guessing cids: use only current leaf classes; otherwise …

runtime/vm/cha_test.cc

 // 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.
 
 #include "platform/assert.h"
 #include "vm/cha.h"
 #include "vm/class_finalizer.h"
 #include "vm/globals.h"
 #include "vm/symbols.h"
 #include "vm/unit_test.h"
@@ skipping 68 matching lines @@
   const Function& class_d_bar =
       Function::Handle(class_d.LookupDynamicFunction(function_bar_name));
   EXPECT(!class_d_bar.IsNull());
 
   CHA cha(Thread::Current());
 
   EXPECT(cha.HasSubclasses(kInstanceCid));
   EXPECT(!cha.HasSubclasses(kSmiCid));
   EXPECT(!cha.HasSubclasses(kNullCid));
 
-  EXPECT(cha.HasSubclasses(class_a));
-  EXPECT(cha.HasSubclasses(class_b));
-  EXPECT(!cha.HasSubclasses(class_c));
+  EXPECT(CHA::HasSubclasses(class_a));
+  EXPECT(CHA::HasSubclasses(class_b));
+  EXPECT(!CHA::HasSubclasses(class_c));
   cha.AddToLeafClasses(class_c);
-  EXPECT(!cha.HasSubclasses(class_d));
+  EXPECT(!CHA::HasSubclasses(class_d));
   cha.AddToLeafClasses(class_d);
 
   EXPECT(!ContainsCid(cha.leaf_classes(), class_a.id()));
   EXPECT(!ContainsCid(cha.leaf_classes(), class_b.id()));
   EXPECT(ContainsCid(cha.leaf_classes(), class_c.id()));
   EXPECT(ContainsCid(cha.leaf_classes(), class_d.id()));
 
   const Class& function_impl_class =
       Class::Handle(Type::Handle(Isolate::Current()->object_store()->
           function_impl_type()).type_class());
   EXPECT(cha.HasSubclasses(function_impl_class.id()));
 }
 
 }  // namespace dart