Index: runtime/vm/simulator_arm.cc |
=================================================================== |
--- runtime/vm/simulator_arm.cc (revision 43896) |
+++ runtime/vm/simulator_arm.cc (working copy) |
@@ -56,7 +56,6 @@ |
link_ = sim->last_setjmp_buffer(); |
sim->set_last_setjmp_buffer(this); |
sp_ = static_cast<uword>(sim->get_register(SP)); |
- native_sp_ = Isolate::GetCurrentStackPointer(); |
} |
~SimulatorSetjmpBuffer() { |
@@ -67,11 +66,9 @@ |
SimulatorSetjmpBuffer* link() { return link_; } |
uword sp() { return sp_; } |
- uword native_sp() { return native_sp_; } |
private: |
uword sp_; |
- uword native_sp_; |
Simulator* simulator_; |
SimulatorSetjmpBuffer* link_; |
jmp_buf buffer_; |
@@ -3859,8 +3856,7 @@ |
// The C++ caller has not cleaned up the stack memory of C++ frames. |
// Prepare for unwinding frames by destroying all the stack resources |
// in the previous C++ frames. |
- uword native_sp = buf->native_sp(); |
- StackResource::Unwind(isolate, native_sp); |
+ StackResource::Unwind(isolate); |
// Unwind the C++ stack and continue simulation in the target frame. |
set_register(PC, static_cast<int32_t>(pc)); |