Nested deoptimization environments.

runtime/vm/flow_graph_compiler.cc

Index: runtime/vm/flow_graph_compiler.cc
diff --git a/runtime/vm/flow_graph_compiler.cc b/runtime/vm/flow_graph_compiler.cc
index 7195d927cab32e51a16b3f5023a26ad459b0c66d..1bcebcd34e42a67551b6f133ca20a7d811d9b5d0 100644
--- a/runtime/vm/flow_graph_compiler.cc
+++ b/runtime/vm/flow_graph_compiler.cc
@@ -59,20 +59,21 @@ RawDeoptInfo* CompilerDeoptInfo::CreateDeoptInfo(FlowGraphCompiler* compiler) {
   intptr_t slot_ix = 0;
   BuildReturnAddress(&builder, function, slot_ix++);
 
-  // All locals between TOS and PC-marker.
-  const GrowableArray<Value*>& values = deoptimization_env_->values();
-
   // Assign locations to values pushed above spill slots with PushArgument.
   intptr_t height = compiler->StackSize();
-  for (intptr_t i = 0; i < values.length(); i++) {
+  for (intptr_t i = 0; i < deoptimization_env_->Length(); i++) {

[Kevin Millikin (Google), 2012/09/07 12:51:52]

This also seems wrong.  There can be pushed arguments in outer environments. 
Consider:

f(e0, e1, g())

in the body of inlined function g, where f is not inlined.  The pushed values of
e0 and e1 will be found in an outer environment.

[zerny-google, 2012/09/07 13:51:37]

Yes. And this needs to be recursive (with a retn-addr before and the pc-marker
and fp after). Will change in the inline-deopt CL.

     if (deoptimization_env_->LocationAt(i).IsInvalid()) {
-      ASSERT(values[i]->definition()->IsPushArgument());
+      ASSERT(deoptimization_env_->ValueAt(i)->definition()->IsPushArgument());
       *deoptimization_env_->LocationSlotAt(i) = Location::StackSlot(height++);
     }
   }
 
-  for (intptr_t i = values.length() - 1; i >= fixed_parameter_count; i--) {
-    builder.AddCopy(deoptimization_env_->LocationAt(i), *values[i], slot_ix++);
+  for (intptr_t i = deoptimization_env_->Length() - 1;
+       i >= fixed_parameter_count;
+       i--) {
+    builder.AddCopy(deoptimization_env_->LocationAt(i),
+                    *deoptimization_env_->ValueAt(i),
+                    slot_ix++);
   }
 
   // PC marker, caller-fp, caller-pc.
@@ -81,7 +82,9 @@ RawDeoptInfo* CompilerDeoptInfo::CreateDeoptInfo(FlowGraphCompiler* compiler) {
   builder.AddCallerPc(slot_ix++);
   // Incoming arguments.
   for (intptr_t i = fixed_parameter_count - 1; i >= 0; i--) {
-    builder.AddCopy(deoptimization_env_->LocationAt(i), *values[i], slot_ix++);
+    builder.AddCopy(deoptimization_env_->LocationAt(i),
+                    *deoptimization_env_->ValueAt(i),
+                    slot_ix++);
   }
 
   const DeoptInfo& deopt_info = DeoptInfo::Handle(builder.CreateDeoptInfo());