Revert "Revert "JumpToFrame refactor"" + Fix

runtime/vm/thread.h

 // Copyright (c) 2015, 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.
 
 #ifndef RUNTIME_VM_THREAD_H_
 #define RUNTIME_VM_THREAD_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/atomic.h"
@@ skipping 453 matching lines @@
   LongJumpScope* long_jump_base() const { return long_jump_base_; }
   void set_long_jump_base(LongJumpScope* value) { long_jump_base_ = value; }
 
   uword vm_tag() const { return vm_tag_; }
   void set_vm_tag(uword tag) { vm_tag_ = tag; }
   static intptr_t vm_tag_offset() { return OFFSET_OF(Thread, vm_tag_); }
 
   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();
 
   CompilerStats* compiler_stats() { return compiler_stats_; }
 
 #if defined(DEBUG)
 #define REUSABLE_HANDLE_SCOPE_ACCESSORS(object)                                \
   void set_reusable_##object##_handle_scope_active(bool value) {               \
     reusable_##object##_handle_scope_active_ = value;                          \
@@ skipping 193 matching lines @@
   uint16_t deferred_interrupts_mask_;
   uint16_t deferred_interrupts_;
   int32_t stack_overflow_count_;
 
   // Compiler state:
   CHA* cha_;
   TypeRangeCache* type_range_cache_;
   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_;
 
 // Reusable handles support.
 #define REUSABLE_HANDLE_FIELDS(object) object* object##_handle_;
   REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_FIELDS)
 #undef REUSABLE_HANDLE_FIELDS
 
 #if defined(DEBUG)
@@ skipping 58 matching lines @@
 // Disable thread interrupts.
 class DisableThreadInterruptsScope : public StackResource {
  public:
   explicit DisableThreadInterruptsScope(Thread* thread);
   ~DisableThreadInterruptsScope();
 };
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_THREAD_H_