Support allocation sinking for compound objects.

runtime/vm/deopt_instructions.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/deopt_instructions.h"
 
 #include "vm/assembler.h"
 #include "vm/code_patcher.h"
 #include "vm/intermediate_language.h"
 #include "vm/locations.h"
@@ skipping 20 matching lines @@
       dest_frame_(NULL),
       dest_frame_size_(0),
       source_frame_is_allocated_(false),
       source_frame_(NULL),
       source_frame_size_(0),
       cpu_registers_(cpu_registers),
       fpu_registers_(fpu_registers),
       num_args_(0),
       deopt_reason_(ICData::kDeoptUnknown),
       isolate_(Isolate::Current()),
-      deferred_boxes_(NULL),
-      deferred_object_refs_(NULL),
+      deferred_slots_(NULL),
       deferred_objects_count_(0),
       deferred_objects_(NULL) {
   object_table_ = code.object_table();
 
   ICData::DeoptReasonId deopt_reason = ICData::kDeoptUnknown;
   const DeoptInfo& deopt_info =
       DeoptInfo::Handle(code.GetDeoptInfoAtPc(frame->pc(), &deopt_reason));
   ASSERT(!deopt_info.IsNull());
   deopt_info_ = deopt_info.raw();
   deopt_reason_ = deopt_reason;
@@ skipping 263 matching lines @@
     current->Materialize(deopt_context);
 
     delete current;
   }
 }
 
 
 // Materializes all deferred objects.  Returns the total number of
 // artificial arguments used during deoptimization.
 intptr_t DeoptContext::MaterializeDeferredObjects() {
-  // First materialize all unboxed "primitive" values (doubles, mints, simd)
-  // then materialize objects. The order is important: objects might be
-  // referencing boxes allocated on the first step. At the same time
-  // objects can't be referencing other deferred objects because storing
-  // an object into a field is always conservatively treated as escaping by
-  // allocation sinking and load forwarding.
-  FillDeferredSlots(this, &deferred_boxes_);
-  FillDeferredSlots(this, &deferred_object_refs_);
+  // Populate slots with references to all unboxed "primitive" values (doubles,
+  // mints, simd) and deferred objects. Deferred objects are only allocated
+  // but not filled with data. This is done later because deferred objects
+  // can references each other.
+  FillDeferredSlots(this, &deferred_slots_);
 
   // Compute total number of artificial arguments used during deoptimization.
   intptr_t deopt_arg_count = 0;
   for (intptr_t i = 0; i < DeferredObjectsCount(); i++) {
+    GetDeferredObject(i)->Fill();
     deopt_arg_count += GetDeferredObject(i)->ArgumentCount();
   }
 
   // Since this is the only step where GC can occur during deoptimization,
   // use it to report the source line where deoptimization occured.
   if (FLAG_trace_deoptimization || FLAG_trace_deoptimization_verbose) {
     DartFrameIterator iterator;
     StackFrame* top_frame = iterator.NextFrame();
     ASSERT(top_frame != NULL);
     const Code& code = Code::Handle(top_frame->LookupDartCode());
@@ skipping 1278 matching lines @@
   // initialized by default.
   intptr_t non_null_fields = 0;
   for (intptr_t i = 0; i < mat->InputCount(); i++) {
     if (!mat->InputAt(i)->BindsToConstantNull()) {
       non_null_fields++;
     }
   }
 
   instructions_.Add(
       new(isolate()) DeoptMaterializeObjectInstr(non_null_fields));
+
+  for (intptr_t i = 0; i < mat->InputCount(); i++) {
+    MaterializeObjectInstr* nested_mat = mat->InputAt(i)->definition()->
+        AsMaterializeObject();
+    if (nested_mat != NULL) {
+      AddMaterialization(nested_mat);
+    }
+  }
 }
 
 
 intptr_t DeoptInfoBuilder::EmitMaterializationArguments(intptr_t dest_index) {
   ASSERT(dest_index == kDartFrameFixedSize);
   for (intptr_t i = 0; i < materializations_.length(); i++) {
     MaterializeObjectInstr* mat = materializations_[i];
     // Class of the instance to allocate.
     AddConstant(mat->cls(), dest_index++);
     for (intptr_t i = 0; i < mat->InputCount(); i++) {
@@ skipping 105 matching lines @@
                           Smi* offset,
                           DeoptInfo* info,
                           Smi* reason) {
   intptr_t i = index * kEntrySize;
   *offset ^= table.At(i);
   *info ^= table.At(i + 1);
   *reason ^= table.At(i + 2);
 }
 
 }  // namespace dart