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

runtime/vm/flow_graph_optimizer.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/flow_graph_optimizer.h"
 
 #include "vm/bit_vector.h"
 #include "vm/cha.h"
 #include "vm/compiler.h"
 #include "vm/cpu.h"
@@ skipping 145 matching lines @@
 
 
 // TODO(srdjan): Test/support other number types as well.
 static bool IsNumberCid(intptr_t cid) {
   return (cid == kSmiCid) || (cid == kDoubleCid);
 }
 
 
 // Attempt to build ICData for call using propagated class-ids.
 bool FlowGraphOptimizer::TryCreateICData(InstanceCallInstr* call) {
-  return false;
   ASSERT(call->HasICData());
   if (call->ic_data()->NumberOfChecks() > 0) {
     // This occurs when an instance call has too many checks, will be converted
     // to megamorphic call.
     return false;
   }
   if (FLAG_warn_on_javascript_compatibility) {
     // Do not make the instance call megamorphic if the callee needs to decode
     // the calling code sequence to lookup the ic data and verify if a warning
     // has already been issued or not.
@@ skipping 58 matching lines @@
       ASSERT(class_ids.length() == 1);
       call->ic_data()->AddReceiverCheck(class_ids[0], function);
     }
     return true;
   }
 
   // Check if getter or setter
   if ((call->token_kind() == Token::kGET) ||
       (call->token_kind() == Token::kSET)) {
     const Class& owner_class = Class::Handle(Z, function().Owner());
-    if (!owner_class.is_abstract()) {
+    if (!owner_class.is_abstract() &&
+        !CHA::HasSubclasses(owner_class) &&
+        !CHA::IsImplemented(owner_class)) {
       // Quite aggressive: if functions's owner has a a getter/setter of that
       // name we add a check and call the setter directly. Considerable
       // performance improvement, some increase in code space.
       // TODO(srdjan): Make sure the getter/setters can be inlined.
       const Array& args_desc_array = Array::Handle(Z,
           ArgumentsDescriptor::New(call->ArgumentCount(),
                                    call->argument_names()));
       ArgumentsDescriptor args_desc(args_desc_array);
       const Function& function = Function::Handle(Z,
           Resolver::ResolveDynamicForReceiverClass(owner_class,
@@ skipping 3745 matching lines @@
 
 // Returns true if checking against this type is a direct class id comparison.
 bool FlowGraphOptimizer::TypeCheckAsClassEquality(const AbstractType& type) {
   ASSERT(type.IsFinalized() && !type.IsMalformedOrMalbounded());
   // Requires CHA.
   if (!type.IsInstantiated()) return false;
   const Class& type_class = Class::Handle(type.type_class());
   // Signature classes have different type checking rules.
   if (type_class.IsSignatureClass()) return false;
   // Could be an interface check?
-  if (thread()->cha()->IsImplemented(type_class)) return false;
+  if (CHA::IsImplemented(type_class)) return false;
   // Check if there are subclasses.
-  if (thread()->cha()->HasSubclasses(type_class)) {
+  if (CHA::HasSubclasses(type_class)) {
     return false;
   }
 
   // Private classes cannot be subclassed by later loaded libs.
   if (!type_class.IsPrivate()) {
     if (FLAG_use_cha_deopt) {
       thread()->cha()->AddToLeafClasses(type_class);
     } else {
       return false;
     }
@@ skipping 4696 matching lines @@
 
   // Insert materializations at environment uses.
   for (intptr_t i = 0; i < exits_collector_.exits().length(); i++) {
     CreateMaterializationAt(
         exits_collector_.exits()[i], alloc, *slots);
   }
 }
 
 
 }  // namespace dart