Put PushArgument into the environment instead of raw values.

runtime/vm/flow_graph_compiler_ia32.cc

 // Copyright (c) 2012, 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/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "lib/error.h"
@@ skipping 28 matching lines @@
     }
   } else {
     // We have a deoptimization environment, we have to tear down the
     // optimized frame and recreate a non-optimized one.
     const intptr_t fixed_parameter_count =
         deoptimization_env_->fixed_parameter_count();
 
     const GrowableArray<Value*>& values = deoptimization_env_->values();
 
     // 1. Build a parallel move representing the frame translation.
+    intptr_t height = compiler->StackSize();
     ParallelMoveInstr* move = new ParallelMoveInstr();
     for (intptr_t i = 0; i < values.length(); i++) {
       Location destination = Location::StackSlot(i - fixed_parameter_count);
       Location source = deoptimization_env_->LocationAt(i);
       if (source.IsInvalid()) {
-        ASSERT(values[i]->IsConstant());
-        source = Location::Constant(values[i]->AsConstant()->value());
+        Value* value = values[i];
+        if (value->IsConstant()) {
+          source = Location::Constant(value->AsConstant()->value());
+        } else {
+          ASSERT(value->IsUse() &&
+                 value->AsUse()->definition()->IsPushArgument());
+          source = Location::StackSlot(height++);
+        }
       }
       move->AddMove(destination, source);
     }
 
 
     const intptr_t local_slot_count = values.length() - fixed_parameter_count;
     const intptr_t top_offset =
         ParsedFunction::kFirstLocalSlotIndex - (local_slot_count - 1);
 
+#if defined(DEBUG)
+    intptr_t optimized_top_offset =
+        (ParsedFunction::kFirstLocalSlotIndex - height) * kWordSize;
+    Label height_ok;
+    __ pushl(EAX);
+    __ leal(EAX, Address(EBP, optimized_top_offset));
+    __ cmpl(EAX, ESP);
+    // Some instructions might push temporary values above an optimized frame.
+    __ j(ABOVE_EQUAL, &height_ok);
+    __ Stop("Optimized frame height mismatch");
+    __ Bind(&height_ok);
+    __ popl(EAX);
+#endif
+
     // ParallelMoveResolver will use push and pop to allocate internally a
     // scratch register for memory to memory moves.  This means we have to
     // ensure that these stack manipulations will not interfere with actual
     // moves. If number of local slots exceed number of spill slots we need
     // to expand reserved stack area before resolving parallel move. Otherwise
     // we need to shrink stack area after resolving parallel move. This
     // guarantees that all moves happen below stack pointer and will not
     // interfere with additional push/pops.
-    const intptr_t spill_slot_count = compiler->StackSize();
-
-    if (local_slot_count > spill_slot_count) {
+    if (local_slot_count >= height) {
       // Expand reserved stack area.
       __ leal(ESP, Address(EBP, top_offset * kWordSize));
     }
 
     compiler->parallel_move_resolver()->EmitNativeCode(move);
 
-    if (local_slot_count < spill_slot_count) {
+    if (local_slot_count < height) {
       // Shrink reserved stack area.
       __ leal(ESP, Address(EBP, top_offset * kWordSize));
     }
   }
 
   if (compiler->IsLeaf()) {
     Label L;
     __ call(&L);
     const intptr_t offset = assem->CodeSize();
     __ Bind(&L);
@@ skipping 1160 matching lines @@
   __ popl(ECX);
   __ popl(EAX);
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32