Put PushArgument into the environment instead of raw values.

runtime/vm/flow_graph_compiler_x64.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_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "lib/error.h"
@@ skipping 30 matching lines @@
     // 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();
 
     // 1. Set the stack pointer to the top of the non-optimized frame.
     const GrowableArray<Value*>& values = deoptimization_env_->values();
     const intptr_t local_slot_count = values.length() - fixed_parameter_count;
     const intptr_t top_offset =
         ParsedFunction::kFirstLocalSlotIndex - (local_slot_count - 1);
+
     __ leaq(RSP, Address(RBP, top_offset * kWordSize));
 
     // 2. Build and emit 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);
     }
     compiler->parallel_move_resolver()->EmitNativeCode(move);
   }
 
   if (compiler->IsLeaf()) {
     __ Comment("Leaf method, lazy PC marker setup");
     Label L;
     __ call(&L);
@@ skipping 1144 matching lines @@
 void ParallelMoveResolver::Exchange(const Address& mem1, const Address& mem2) {
   __ Exchange(mem1, mem2);
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64