Index: runtime/vm/simulator_arm64.cc |
diff --git a/runtime/vm/simulator_arm64.cc b/runtime/vm/simulator_arm64.cc |
index 65a2034d1ed8556fcfb59ba790b276dccd071478..a0555677d03fa267299cbc1badf672e50d99727e 100644 |
--- a/runtime/vm/simulator_arm64.cc |
+++ b/runtime/vm/simulator_arm64.cc |
@@ -3602,7 +3602,12 @@ int64_t Simulator::Call(int64_t entry, |
} |
-void Simulator::JumpToFrame(uword pc, uword sp, uword fp, Thread* thread) { |
+void Simulator::Longjmp(uword pc, |
+ uword sp, |
+ uword fp, |
+ RawObject* raw_exception, |
+ RawObject* raw_stacktrace, |
+ Thread* thread) { |
// Walk over all setjmp buffers (simulated --> C++ transitions) |
// and try to find the setjmp associated with the simulated stack pointer. |
SimulatorSetjmpBuffer* buf = last_setjmp_buffer(); |
@@ -3625,6 +3630,10 @@ void Simulator::JumpToFrame(uword pc, uword sp, uword fp, Thread* thread) { |
thread->set_vm_tag(VMTag::kDartTagId); |
// Clear top exit frame. |
thread->set_top_exit_frame_info(0); |
+ |
+ ASSERT(raw_exception != Object::null()); |
+ set_register(NULL, kExceptionObjectReg, bit_cast<int64_t>(raw_exception)); |
+ set_register(NULL, kStackTraceObjectReg, bit_cast<int64_t>(raw_stacktrace)); |
// Restore pool pointer. |
int64_t code = |
*reinterpret_cast<int64_t*>(fp + kPcMarkerSlotFromFp * kWordSize); |