Implement deoptimization in the SSA compiler as a parallel move.

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 19 matching lines @@
   __ Comment("Deopt stub for id %d", deopt_id_);
   __ Bind(entry_label());
 
   if (deoptimization_env_ == NULL) {
     for (intptr_t i = 0; i < registers_.length(); i++) {
       if (registers_[i] != kNoRegister) {
         __ pushl(registers_[i]);
       }
     }
   } else {
-    // We have a deoptimization environment, we have to tear down optimized
-    // frame and recreate non-optimized one.
-    __ leal(ESP,
-            Address(EBP, ParsedFunction::kFirstLocalSlotIndex * kWordSize));
+    // We have a deoptimization environment, we have to tear down the
+    // optimized frame and recreate a non-optimized one.
 
+    // 1. Set the stack pointer to the top of the non-optimized frame.
     const GrowableArray<Value*>& values = deoptimization_env_->values();
+    const int top_offset =

[srdjan, 2012/07/25 17:25:52]

s/int/intptr_t/

+        ParsedFunction::kFirstLocalSlotIndex - values.length();
+    __ leal(ESP, Address(EBP, 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++) {
-      const Location loc = deoptimization_env_->LocationAt(i);
-      if (loc.IsInvalid()) {
-        ASSERT(values[i]->IsConstant());
-        __ PushObject(values[i]->AsConstant()->value());
-      } else if (loc.IsRegister()) {
-        __ pushl(loc.reg());
-      } else {
+      Location destination = Location::SpillSlot(i);
+      Location source = deoptimization_env_->LocationAt(i);
+      if (!source.IsRegister() && !source.IsInvalid()) {
         compiler->Bailout("unsupported deoptimization state");
       }
+      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()) {
     Label L;
     __ call(&L);
     const intptr_t offset = assem->CodeSize();
     __ Bind(&L);
     __ popl(EAX);
     __ subl(EAX,
         Immediate(offset - AssemblerMacros::kOffsetOfSavedPCfromEntrypoint));
@@ skipping 1159 matching lines @@
   __ popl(ECX);
   __ popl(EAX);
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32