Some cleanups, fixes. Parts of the cid guessing CL that was revrted.

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/dart_entry.h"
 #include "vm/flow_graph_builder.h"
@@ skipping 78 matching lines @@
         if (compare->IsStrictCompare()) {
           VisitStrictCompare(compare->AsStrictCompare());
         }
       }
     }
     current_iterator_ = NULL;
   }
 }
 
 
+static bool NoneIsDynamic(const GrowableArray<intptr_t>& cids) {
+  for (intptr_t i = 0; i < cids.length(); i++) {
+    if (cids[i] == kDynamicCid) {
+      return false;
+    }
+  }
+  return true;
+}
+
+
 // Attempt to build ICData for call using propagated class-ids.
 bool FlowGraphOptimizer::TryCreateICData(InstanceCallInstr* call) {
   ASSERT(call->HasICData());
   if (call->ic_data()->NumberOfChecks() > 0) {
     // This occurs when an instance call has too many checks.
-    // TODO(srdjan): Replace IC call with megamorphic call.
     return false;
   }
   GrowableArray<intptr_t> class_ids(call->ic_data()->num_args_tested());
   ASSERT(call->ic_data()->num_args_tested() <= call->ArgumentCount());
   for (intptr_t i = 0; i < call->ic_data()->num_args_tested(); i++) {
     intptr_t cid = call->PushArgumentAt(i)->value()->Type()->ToCid();
     class_ids.Add(cid);
   }
-  if (class_ids[0] != kDynamicCid) {
+  if (NoneIsDynamic(class_ids)) {

[Florian Schneider, 2013/12/11 10:41:08]

I'd prefer naming this helper the opposite: e.g. OnlyKnownCids

[srdjan, 2013/12/11 21:54:59]

Aggreed. However, decided to inline the loop and eliminate function.

     ArgumentsDescriptor args_desc(
         Array::Handle(ArgumentsDescriptor::New(call->ArgumentCount(),
                                                call->argument_names())));
     const Class& receiver_class = Class::Handle(
         Isolate::Current()->class_table()->At(class_ids[0]));
     const Function& function = Function::Handle(
         Resolver::ResolveDynamicForReceiverClass(
             receiver_class,
             call->function_name(),
             args_desc));
@@ skipping 6775 matching lines @@
   SetValue(instr, non_constant_);
 }
 
 
 void ConstantPropagator::VisitUnboxInteger(UnboxIntegerInstr* instr) {
   // TODO(kmillikin): Handle unbox operation.
   SetValue(instr, non_constant_);
 }
 
 
-void ConstantPropagator::VisitBinaryMintOp(
-    BinaryMintOpInstr* instr) {
+void ConstantPropagator::VisitBinaryMintOp(BinaryMintOpInstr* instr) {
   HandleBinaryOp(instr, instr->op_kind(), *instr->left(), *instr->right());
 }
 
 
-void ConstantPropagator::VisitShiftMintOp(
-    ShiftMintOpInstr* instr) {
+void ConstantPropagator::VisitShiftMintOp(ShiftMintOpInstr* instr) {
   HandleBinaryOp(instr, instr->op_kind(), *instr->left(), *instr->right());
 }
 
 
-void ConstantPropagator::VisitUnaryMintOp(
-    UnaryMintOpInstr* instr) {
+void ConstantPropagator::VisitUnaryMintOp(UnaryMintOpInstr* instr) {
   // TODO(kmillikin): Handle unary operations.
   SetValue(instr, non_constant_);
 }
 
 
 void ConstantPropagator::VisitUnarySmiOp(UnarySmiOpInstr* instr) {
   const Object& value = instr->value()->definition()->constant_value();
   if (IsNonConstant(value)) {
     SetValue(instr, non_constant_);
   } else if (IsConstant(value)) {
@@ skipping 1113 matching lines @@
   }
 
   // Insert materializations at environment uses.
   for (intptr_t i = 0; i < exits.length(); i++) {
     CreateMaterializationAt(exits[i], alloc, alloc->cls(), *fields);
   }
 }
 
 
 }  // namespace dart