Revert "Revert "JumpToFrame refactor"" + Fix

runtime/vm/thread.h

Index: runtime/vm/thread.h
diff --git a/runtime/vm/thread.h b/runtime/vm/thread.h
index 95d04b2acbbb3ec634661fde07d9d4e898b5c6fc..a9fb55faaa400ba83db8891442d38e261236a283 100644
--- a/runtime/vm/thread.h
+++ b/runtime/vm/thread.h
@@ -471,6 +471,22 @@ class Thread : public BaseThread {
   RawGrowableObjectArray* pending_functions();
   void clear_pending_functions();
 
+  RawObject* active_exception() const { return active_exception_; }
+  void set_active_exception(const Object& value);
+  static intptr_t active_exception_offset() {
+    return OFFSET_OF(Thread, active_exception_);
+  }
+
+  RawObject* active_stacktrace() const { return active_stacktrace_; }
+  void set_active_stacktrace(const Object& value);
+  static intptr_t active_stacktrace_offset() {
+    return OFFSET_OF(Thread, active_stacktrace_);
+  }
+
+  uword resume_pc() const { return resume_pc_; }
+  void set_resume_pc(uword value) { resume_pc_ = value; }
+  static uword resume_pc_offset() { return OFFSET_OF(Thread, resume_pc_); }
+
   RawError* sticky_error() const;
   void set_sticky_error(const Error& value);
   void clear_sticky_error();
@@ -684,6 +700,11 @@ class Thread : public BaseThread {
   intptr_t deopt_id_;  // Compilation specific counter.
   RawGrowableObjectArray* pending_functions_;
 
+  // JumpToExceptionHandler state:
+  RawObject* active_exception_;
+  RawObject* active_stacktrace_;
+  uword resume_pc_;
+
   RawError* sticky_error_;
 
   CompilerStats* compiler_stats_;