Support allocation sinking for compound objects.

runtime/vm/deopt_instructions.h

 // 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.
 
 #ifndef VM_DEOPT_INSTRUCTIONS_H_
 #define VM_DEOPT_INSTRUCTIONS_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
@@ skipping 96 matching lines @@
 
   // Materializes all deferred objects.  Returns the total number of
   // artificial arguments used during deoptimization.
   intptr_t MaterializeDeferredObjects();
 
   RawArray* DestFrameAsArray();
 
   void VisitObjectPointers(ObjectPointerVisitor* visitor);
 
   void DeferMaterializedObjectRef(intptr_t idx, intptr_t* slot) {
-    deferred_object_refs_ = new DeferredObjectRef(
+    deferred_slots_ = new DeferredObjectRef(
         idx,
         reinterpret_cast<RawInstance**>(slot),
-        deferred_object_refs_);
+        deferred_slots_);
   }
 
   void DeferDoubleMaterialization(double value, RawDouble** slot) {
-    deferred_boxes_ = new DeferredDouble(
+    deferred_slots_ = new DeferredDouble(
         value,
         reinterpret_cast<RawInstance**>(slot),
-        deferred_boxes_);
+        deferred_slots_);
   }
 
   void DeferMintMaterialization(int64_t value, RawMint** slot) {
-    deferred_boxes_ = new DeferredMint(
+    deferred_slots_ = new DeferredMint(
         value,
         reinterpret_cast<RawInstance**>(slot),
-        deferred_boxes_);
+        deferred_slots_);
   }
 
   void DeferFloat32x4Materialization(simd128_value_t value,
                                      RawFloat32x4** slot) {
-    deferred_boxes_ = new DeferredFloat32x4(
+    deferred_slots_ = new DeferredFloat32x4(
         value,
         reinterpret_cast<RawInstance**>(slot),
-        deferred_boxes_);
+        deferred_slots_);
   }
 
   void DeferFloat64x2Materialization(simd128_value_t value,
                                      RawFloat64x2** slot) {
-    deferred_boxes_ = new DeferredFloat64x2(
+    deferred_slots_ = new DeferredFloat64x2(
         value,
         reinterpret_cast<RawInstance**>(slot),
-        deferred_boxes_);
+        deferred_slots_);
   }
 
   void DeferInt32x4Materialization(simd128_value_t value,
                                     RawInt32x4** slot) {
-    deferred_boxes_ = new DeferredInt32x4(
+    deferred_slots_ = new DeferredInt32x4(
         value,
         reinterpret_cast<RawInstance**>(slot),
-        deferred_boxes_);
+        deferred_slots_);
   }
 
   DeferredObject* GetDeferredObject(intptr_t idx) const {
     return deferred_objects_[idx];
   }
 
  private:
   intptr_t* GetDestFrameAddressAt(intptr_t index) const {
     ASSERT(dest_frame_ != NULL);
     ASSERT((0 <= index) && (index < dest_frame_size_));
@@ skipping 27 matching lines @@
   bool source_frame_is_allocated_;
   intptr_t* source_frame_;
   intptr_t source_frame_size_;
   intptr_t* cpu_registers_;
   fpu_register_t* fpu_registers_;
   intptr_t num_args_;
   ICData::DeoptReasonId deopt_reason_;
   intptr_t caller_fp_;
   Isolate* isolate_;
 
-  DeferredSlot* deferred_boxes_;
-  DeferredSlot* deferred_object_refs_;
+  DeferredSlot* deferred_slots_;
 
   intptr_t deferred_objects_count_;
   DeferredObject** deferred_objects_;
 
   DISALLOW_COPY_AND_ASSIGN(DeoptContext);
 };
 
 
 
 // Represents one deopt instruction, e.g, setup return address, store object,
@@ skipping 181 matching lines @@
                        DeoptInfo* info,
                        Smi* reason);
 
  private:
   static const intptr_t kEntrySize = 3;
 };
 
 }  // namespace dart
 
 #endif  // VM_DEOPT_INSTRUCTIONS_H_