Support allocation sinking for compound objects.

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 2263 matching lines @@
 
 void MaterializeObjectInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   UNREACHABLE();
 }
 
 
 // This function should be kept in sync with
 // FlowGraphCompiler::SlowPathEnvironmentFor().
 void MaterializeObjectInstr::RemapRegisters(intptr_t* fpu_reg_slots,
                                             intptr_t* cpu_reg_slots) {
+  if (registers_remapped_) {
+    return;
+  }
+  registers_remapped_ = true;
+
   for (intptr_t i = 0; i < InputCount(); i++) {
     Location loc = LocationAt(i);
     if (loc.IsRegister()) {
       intptr_t index = cpu_reg_slots[loc.reg()];
       ASSERT(index >= 0);
       locations_[i] = Location::StackSlot(index);
     } else if (loc.IsFpuRegister()) {
       intptr_t index = fpu_reg_slots[loc.fpu_reg()];
       ASSERT(index >= 0);
       Value* value = InputAt(i);
       switch (value->definition()->representation()) {
         case kUnboxedDouble:
           locations_[i] = Location::DoubleStackSlot(index);
           break;
         case kUnboxedFloat32x4:
         case kUnboxedInt32x4:
         case kUnboxedFloat64x2:
           locations_[i] = Location::QuadStackSlot(index);
           break;
         default:
           UNREACHABLE();
       }
     } else if (loc.IsPairLocation()) {
       UNREACHABLE();
-    } else if (loc.IsInvalid()) {
-      // We currently only perform one iteration of allocation
-      // sinking, so we do not expect to find materialized objects
-      // here.
-      ASSERT(!InputAt(i)->definition()->IsMaterializeObject());
+    } else if (loc.IsInvalid() &&
+               InputAt(i)->definition()->IsMaterializeObject()) {
+      InputAt(i)->definition()->AsMaterializeObject()->RemapRegisters(
+          fpu_reg_slots, cpu_reg_slots);
     }
   }
 }
 
 
 LocationSummary* StoreContextInstr::MakeLocationSummary(Isolate* isolate,
                                                         bool optimizing) const {
   const intptr_t kNumInputs = 1;
   const intptr_t kNumTemps = 0;
   LocationSummary* summary = new(isolate) LocationSummary(
@@ skipping 1782 matching lines @@
     case Token::kTRUNCDIV: return 0;
     case Token::kMOD: return 1;
     default: UNIMPLEMENTED(); return -1;
   }
 }
 
 
 #undef __
 
 }  // namespace dart