Reapply "Deoptimization support in inlined code."

runtime/vm/stub_code_ia32.cc

-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// 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"
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/assembler.h"
 #include "vm/assembler_macros.h"
 #include "vm/compiler.h"
 #include "vm/flow_graph_compiler.h"
@@ skipping 532 matching lines @@
   __ movl(Address(ESP, 0), EDX);
 
   __ EnterFrame(0);
   __ movl(ECX, ESP);  // Get last FP address.
   if (preserve_eax) {
     __ pushl(EBX);  // Preserve result.
   }
   __ ReserveAlignedFrameSpace(1 * kWordSize);
   __ movl(Address(ESP, 0), ECX);
   __ CallRuntime(kDeoptimizeFillFrameRuntimeEntry);
-
+  // Result (EAX) is our FP.
   if (preserve_eax) {
-    // Restore result into EAX.
-    __ movl(EAX, Address(EBP, -1 * kWordSize));
+    // Restore result into EBX.
+    __ movl(EBX, Address(EBP, -1 * kWordSize));
   }
   // Code above cannot cause GC.
   __ LeaveFrame();
+  __ movl(EBP, EAX);
 
   // Frame is fully rewritten at this point and it is safe to perform a GC.
   // Materialize any objects that were deferred by FillFrame because they
   // require allocation.
   __ EnterFrame(0);
   if (preserve_eax) {
-    __ pushl(EAX);  // Preserve result, it will be GC-d here.
+    __ pushl(EBX);  // Preserve result, it will be GC-d here.
   }
   __ CallRuntime(kDeoptimizeMaterializeDoublesRuntimeEntry);
   if (preserve_eax) {
     __ popl(EAX);  // Restore result.
   }
   __ LeaveFrame();
   __ ret();
 }
 
 // TOS: return address + call-instruction-size (5 bytes).
@@ skipping 1381 matching lines @@
   __ movl(EAX, Address(ESP, 4 * kWordSize));  // Load error object.
   __ movl(EBP, Address(ESP, 3 * kWordSize));  // Load target frame_pointer.
   __ movl(EBX, Address(ESP, 1 * kWordSize));  // Load target PC into EBX.
   __ movl(ESP, Address(ESP, 2 * kWordSize));  // Load target stack_pointer.
   __ jmp(EBX);  // Jump to the exception handler code.
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32