Revert "Pass new pool pointer to the JumpToException stub instead of reloading in through the frame…

runtime/vm/simulator_arm64.cc

Index: runtime/vm/simulator_arm64.cc
diff --git a/runtime/vm/simulator_arm64.cc b/runtime/vm/simulator_arm64.cc
index 1b9202c3ef977ec22eacdc817eb82a209883bd6f..0cfcb2a85acf1df343bbedc639b040244c527a58 100644
--- a/runtime/vm/simulator_arm64.cc
+++ b/runtime/vm/simulator_arm64.cc
@@ -3575,7 +3575,6 @@ int64_t Simulator::Call(int64_t entry,
 void Simulator::Longjmp(uword pc,
                         uword sp,
                         uword fp,
-                        uword pp,
                         RawObject* raw_exception,
                         RawObject* raw_stacktrace,
                         Thread* thread) {
@@ -3596,8 +3595,6 @@ void Simulator::Longjmp(uword pc,
   set_pc(static_cast<int64_t>(pc));
   set_register(NULL, SP, static_cast<int64_t>(sp));
   set_register(NULL, FP, static_cast<int64_t>(fp));
-  // In the PP register, the pool pointer is untagged.
-  set_register(NULL, PP, static_cast<int64_t>(pp) - kHeapObjectTag);
   set_register(NULL, THR, reinterpret_cast<int64_t>(thread));
   // Set the tag.
   thread->set_vm_tag(VMTag::kDartTagId);
@@ -3607,6 +3604,14 @@ void Simulator::Longjmp(uword pc,
   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);
+  int64_t pp = *reinterpret_cast<int64_t*>(
+      code + Code::object_pool_offset() - kHeapObjectTag);
+  pp -= kHeapObjectTag;  // In the PP register, the pool pointer is untagged.
+  set_register(NULL, CODE_REG, code);
+  set_register(NULL, PP, pp);
   buf->Longjmp();
 }