Fix polymorphic inlining of method dispatchers.

runtime/vm/intermediate_language.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/intermediate_language.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/bit_vector.h"
 #include "vm/cpu.h"
 #include "vm/dart_entry.h"
@@ skipping 30 matching lines @@
       type_(NULL),
       temp_index_(-1),
       ssa_temp_index_(-1),
       input_use_list_(NULL),
       env_use_list_(NULL),
       use_kind_(kValue),  // Phis and parameters rely on this default.
       constant_value_(Object::ZoneHandle(ConstantPropagator::Unknown())) {
 }
 
 
+Definition* Definition::OriginalDefinition() {
+  Definition* defn = this;
+  while (defn->IsRedefinition() || defn->IsAssertAssignable()) {
+    if (defn->IsRedefinition()) {
+      defn = defn->AsRedefinition()->value()->definition();
+    } else {
+      defn = defn->AsAssertAssignable()->value()->definition();
+    }
+  }
+  return defn;
+}
+
+
 ICData* Instruction::GetICData(const Array& ic_data_array) const {
   ICData& ic_data = ICData::ZoneHandle();
   // The deopt_id can be outside the range of the IC data array for
   // computations added in the optimizing compiler.
   if (!ic_data_array.IsNull() && (deopt_id_ < ic_data_array.Length())) {
     ic_data ^= ic_data_array.At(deopt_id_);
   }
   return &ic_data;
 }
 
@@ skipping 2092 matching lines @@
 
 
 bool PolymorphicInstanceCallInstr::HasSingleRecognizedTarget() const {
   return ic_data().HasOneTarget() &&
       (MethodRecognizer::RecognizeKind(
           Function::Handle(ic_data().GetTargetAt(0))) !=
        MethodRecognizer::kUnknown);
 }
 
 
-bool PolymorphicInstanceCallInstr::HasSingleDispatcherTarget() const {
-  if (!ic_data().HasOneTarget()) return false;
-  const Function& target = Function::Handle(ic_data().GetTargetAt(0));
-  return target.IsNoSuchMethodDispatcher() || target.IsInvokeFieldDispatcher();
+bool PolymorphicInstanceCallInstr::HasOnlyDispatcherTargets() const {
+  for (intptr_t i = 0; i < ic_data().NumberOfChecks(); ++i) {
+    const Function& target = Function::Handle(ic_data().GetTargetAt(i));

[srdjan, 2014/04/11 17:01:04]

'Allocate' handle outside the loop.

+    if (!target.IsNoSuchMethodDispatcher() &&
+        !target.IsInvokeFieldDispatcher()) {
+      return false;
+    }
+  }
+  return true;
 }
 
 
 LocationSummary* StaticCallInstr::MakeLocationSummary(bool optimizing) const {
   return MakeCallSummary();
 }
 
 
 void StaticCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   if (!compiler->is_optimizing()) {
@@ skipping 1074 matching lines @@
     case Token::kTRUNCDIV: return 0;
     case Token::kMOD: return 1;
     default: UNIMPLEMENTED(); return -1;
   }
 }
 
 
 #undef __
 
 }  // namespace dart