Fix polymorphic inlining of method dispatchers.

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/cpu.h"
 #include "vm/dart_entry.h"
@@ skipping 3700 matching lines @@
     if (prev.IsNull()) {
       prev = Bool::Get(is_subtype).raw();
     } else {
       if (is_subtype != prev.value()) return Bool::null();
     }
   }
   return prev.raw();
 }
 
 
-static Definition* OriginalDefinition(Definition* defn) {
-  while (defn->IsRedefinition() || defn->IsAssertAssignable()) {
-    if (defn->IsRedefinition()) {
-      defn = defn->AsRedefinition()->value()->definition();
-    } else {
-      defn = defn->AsAssertAssignable()->value()->definition();
-    }
-  }
-  return defn;
-}
-
-
 // Returns true if checking against this type is a direct class id comparison.
 static bool TypeCheckAsClassEquality(const AbstractType& type) {
   ASSERT(type.IsFinalized() && !type.IsMalformedOrMalbounded());
   // Requires CHA.
   if (!FLAG_use_cha) return false;
   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?
@@ skipping 18 matching lines @@
 
 // TODO(srdjan): Use ICData to check if always true or false.
 void FlowGraphOptimizer::ReplaceWithInstanceOf(InstanceCallInstr* call) {
   ASSERT(Token::IsTypeTestOperator(call->token_kind()));
   Definition* left = call->ArgumentAt(0);
   Definition* instantiator = call->ArgumentAt(1);
   Definition* type_args = call->ArgumentAt(2);
   const AbstractType& type =
       AbstractType::Cast(call->ArgumentAt(3)->AsConstant()->value());
   const bool negate = Bool::Cast(
-      OriginalDefinition(call->ArgumentAt(4))->AsConstant()->value()).value();
+      call->ArgumentAt(4)->OriginalDefinition()->AsConstant()->value()).value();
   const ICData& unary_checks =
       ICData::ZoneHandle(call->ic_data()->AsUnaryClassChecks());
   if (unary_checks.NumberOfChecks() <= FLAG_max_polymorphic_checks) {
     Bool& as_bool = Bool::ZoneHandle(InstanceOfAsBool(unary_checks, type));
     if (!as_bool.IsNull()) {
       AddReceiverCheck(call);
       if (negate) {
         as_bool = Bool::Get(!as_bool.value()).raw();
       }
       ConstantInstr* bool_const = flow_graph()->GetConstant(as_bool);
@@ skipping 1386 matching lines @@
   Place(Instruction* instr, bool* is_load)
       : kind_(kNone),
         representation_(kNoRepresentation),
         instance_(NULL),
         raw_selector_(0),
         id_(0) {
     switch (instr->tag()) {
       case Instruction::kLoadField: {
         LoadFieldInstr* load_field = instr->AsLoadField();
         representation_ = load_field->representation();
-        instance_ = OriginalDefinition(load_field->instance()->definition());
+        instance_ = load_field->instance()->definition()->OriginalDefinition();
         if (load_field->field() != NULL) {
           kind_ = kField;
           field_ = load_field->field();
         } else {
           kind_ = kVMField;
           offset_in_bytes_ = load_field->offset_in_bytes();
         }
         *is_load = true;
         break;
       }
 
       case Instruction::kStoreInstanceField: {
         StoreInstanceFieldInstr* store =
             instr->AsStoreInstanceField();
         representation_ = store->RequiredInputRepresentation(
             StoreInstanceFieldInstr::kValuePos);
-        instance_ = OriginalDefinition(store->instance()->definition());
+        instance_ = store->instance()->definition()->OriginalDefinition();
         if (!store->field().IsNull()) {
           kind_ = kField;
           field_ = &store->field();
         } else {
           kind_ = kVMField;
           offset_in_bytes_ = store->offset_in_bytes();
         }
         break;
       }
 
       case Instruction::kLoadStaticField:
         kind_ = kField;
         representation_ = instr->AsLoadStaticField()->representation();
         field_ = &instr->AsLoadStaticField()->StaticField();
         *is_load = true;
         break;
 
       case Instruction::kStoreStaticField:
         kind_ = kField;
         representation_ = instr->AsStoreStaticField()->
             RequiredInputRepresentation(StoreStaticFieldInstr::kValuePos);
         field_ = &instr->AsStoreStaticField()->field();
         break;
 
       case Instruction::kLoadIndexed: {
         LoadIndexedInstr* load_indexed = instr->AsLoadIndexed();
         kind_ = kIndexed;
         representation_ = load_indexed->representation();
-        instance_ = OriginalDefinition(load_indexed->array()->definition());
+        instance_ = load_indexed->array()->definition()->OriginalDefinition();
         index_ = load_indexed->index()->definition();
         *is_load = true;
         break;
       }
 
       case Instruction::kStoreIndexed: {
         StoreIndexedInstr* store_indexed = instr->AsStoreIndexed();
         kind_ = kIndexed;
         representation_ = store_indexed->
             RequiredInputRepresentation(StoreIndexedInstr::kValuePos);
-        instance_ = OriginalDefinition(store_indexed->array()->definition());
+        instance_ = store_indexed->array()->definition()->OriginalDefinition();
         index_ = store_indexed->index()->definition();
         break;
       }
 
       case Instruction::kCurrentContext:
         kind_ = kContext;
         ASSERT(instr->AsCurrentContext()->representation() == kTagged);
         representation_ = kTagged;
         *is_load = true;
         break;
@@ skipping 17 matching lines @@
 
   Representation representation() const { return representation_; }
 
   Definition* instance() const {
     ASSERT((kind_ == kField) || (kind_ == kVMField) || (kind_ == kIndexed));
     return instance_;
   }
 
   void set_instance(Definition* def) {
     ASSERT((kind_ == kField) || (kind_ == kVMField) || (kind_ == kIndexed));
-    instance_ = OriginalDefinition(def);
+    instance_ = def->OriginalDefinition();
   }
 
   const Field& field() const {
     ASSERT(kind_ == kField);
     return *field_;
   }
 
   intptr_t offset_in_bytes() const {
     ASSERT(kind_ == kVMField);
     return offset_in_bytes_;
@@ skipping 3769 matching lines @@
   }
 
   // Insert materializations at environment uses.
   for (intptr_t i = 0; i < exits.length(); i++) {
     CreateMaterializationAt(exits[i], alloc, alloc->cls(), *slots);
   }
 }
 
 
 }  // namespace dart