Restore original version of FlowGraphOptimizer::TryCreateICData while investigating dart2js failure

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 143 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) {
   ASSERT(call->HasICData());
-  if (call->ic_data()->NumberOfChecks() > 0) {
+  if (call->ic_data()->NumberOfUsedChecks() > 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.
     // TryCreateICData is only invoked if the ic_data target has not been called
     // yet, so no warning can possibly have been issued.
@@ skipping 19 matching lines @@
       const intptr_t cid_0 = class_ids[0];
       const intptr_t cid_1 = class_ids[1];
       if ((cid_0 == kDynamicCid) && (IsNumberCid(cid_1))) {
         class_ids[0] = cid_1;
       } else if (IsNumberCid(cid_0) && (cid_1 == kDynamicCid)) {
         class_ids[1] = cid_0;
       }
     }
   }
 
-  bool all_cids_known = true;
   for (intptr_t i = 0; i < class_ids.length(); i++) {
     if (class_ids[i] == kDynamicCid) {
       // Not all cid-s known.
-      all_cids_known = false;
-      break;
+      return false;
     }
   }
 
-  if (all_cids_known) {
-    const Array& args_desc_array = Array::Handle(Z,
-        ArgumentsDescriptor::New(call->ArgumentCount(),
-                                 call->argument_names()));
-    ArgumentsDescriptor args_desc(args_desc_array);
-    const Class& receiver_class = Class::Handle(Z,
-        isolate()->class_table()->At(class_ids[0]));
-    const Function& function = Function::Handle(Z,
-        Resolver::ResolveDynamicForReceiverClass(
-            receiver_class,
-            call->function_name(),
-            args_desc));
-    if (function.IsNull()) {
-      return false;
-    }
-    if (class_ids.length() > 1) {
-      call->ic_data()->AddCheck(class_ids, function);
-    } else {
-      ASSERT(class_ids.length() == 1);
-      call->ic_data()->AddReceiverCheck(class_ids[0], function);
-    }
-    return true;
+  const Array& args_desc_array = Array::Handle(Z,
+      ArgumentsDescriptor::New(call->ArgumentCount(), call->argument_names()));
+  ArgumentsDescriptor args_desc(args_desc_array);
+  const Class& receiver_class = Class::Handle(Z,
+      isolate()->class_table()->At(class_ids[0]));
+  const Function& function = Function::Handle(Z,
+      Resolver::ResolveDynamicForReceiverClass(
+          receiver_class,
+          call->function_name(),
+          args_desc));
+  if (function.IsNull()) {
+    return false;
   }
-
-  // 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() &&
-        !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,
-                                                   call->function_name(),
-                                                   args_desc));
-      if (!function.IsNull()) {
-        call->ic_data()->AddReceiverCheck(owner_class.id(), function);
-        return true;
-      }
-    }
+  // Create new ICData, do not modify the one attached to the instruction
+  // since it is attached to the assembly instruction itself.
+  // TODO(srdjan): Prevent modification of ICData object that is
+  // referenced in assembly code.
+  ICData& ic_data = ICData::ZoneHandle(Z, ICData::New(
+      flow_graph_->function(),
+      call->function_name(),
+      args_desc_array,
+      call->deopt_id(),
+      class_ids.length()));
+  if (class_ids.length() > 1) {
+    ic_data.AddCheck(class_ids, function);
+  } else {
+    ASSERT(class_ids.length() == 1);
+    ic_data.AddReceiverCheck(class_ids[0], function);
   }
-
-  return false;
+  call->set_ic_data(&ic_data);
+  return true;
 }
 
 
 const ICData& FlowGraphOptimizer::TrySpecializeICData(const ICData& ic_data,
                                                       intptr_t cid) {
   ASSERT(ic_data.NumArgsTested() == 1);
 
   if ((ic_data.NumberOfUsedChecks() == 1) && ic_data.HasReceiverClassId(cid)) {
     return ic_data;  // Nothing to do
   }
@@ skipping 8444 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