Replace deopt stubs location/register shuffling with using deopt-info.

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 14 matching lines @@
 
 
 void DeoptimizationStub::GenerateCode(FlowGraphCompiler* compiler,
                                       intptr_t stub_ix) {
   Assembler* assem = compiler->assembler();
 #define __ assem->
   __ Comment("Deopt stub for id %d", deopt_id_);
   __ Bind(entry_label());
 
   if (deoptimization_env_ == NULL) {
+    // TODO(srdjan): Deprecate once non-SSA optimizing compiler is removed.
     for (intptr_t i = 0; i < registers_.length(); i++) {
       if (registers_[i] != kNoRegister) {
         __ pushq(registers_[i]);
       }
     }
-  } 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();
-
-    // 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.
-    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());
-      }
-      move->AddMove(destination, source);
-    }
-    compiler->parallel_move_resolver()->EmitNativeCode(move);
   }
-
   if (compiler->IsLeaf()) {
     __ Comment("Leaf method, lazy PC marker setup");
+    // TODO(srdjan): Can we use TMP instead of RAX? We must guarantee that
+    // TMP is never part od deoptimization environment.

[siva, 2012/08/09 21:38:19]

od -> of

[srdjan, 2012/08/09 23:28:30]

Done.

+    __ pushq(RAX);  // Preserve RAX.
     Label L;
     __ call(&L);
     const intptr_t offset = assem->CodeSize();
     __ Bind(&L);
     __ popq(RAX);
     __ subq(RAX,
         Immediate(offset - AssemblerMacros::kOffsetOfSavedPCfromEntrypoint));
     __ movq(Address(RBP, -kWordSize), RAX);
+    __ popq(RAX);  // Restore RAX.
   }
   __ call(&StubCode::DeoptimizeLabel());
   const intptr_t deopt_info_index = stub_ix;
-  compiler->pc_descriptors_list()-> AddDeoptInfo(
+  compiler->pc_descriptors_list()->AddDeoptInfo(
       compiler->assembler()->CodeSize(),
       deopt_id_,
       reason_,
       deopt_info_index);
   __ int3();
 #undef __
 }
 
 
 #define __ assembler()->
@@ skipping 1123 matching lines @@
 void ParallelMoveResolver::Exchange(const Address& mem1, const Address& mem2) {
   __ Exchange(mem1, mem2);
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64