Refactor Isolate -> Thread in NativeArguments and exception handler jump.

runtime/vm/native_arguments.h

 // Copyright (c) 2012, 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 VM_NATIVE_ARGUMENTS_H_
 #define VM_NATIVE_ARGUMENTS_H_
 
 #include "platform/assert.h"
 #include "platform/memory_sanitizer.h"
 #include "vm/globals.h"
 #include "vm/handles_impl.h"
 #include "vm/simulator.h"
 #include "vm/stub_code.h"
 
 namespace dart {
 
 DECLARE_FLAG(bool, deoptimize_alot);
 DECLARE_FLAG(bool, trace_natives);
 DECLARE_FLAG(bool, verify_on_transition);
 
 // Forward declarations.
 class BootstrapNatives;
-class Isolate;
 class Object;
 class RawObject;
 class Simulator;
+class Thread;
 
 #if defined(TESTING) || defined(DEBUG)
 
 #if defined(USING_SIMULATOR)
 #define CHECK_STACK_ALIGNMENT {                                                \
   uword current_sp = Simulator::Current()->get_register(SPREG);                \
   ASSERT(Utils::IsAligned(current_sp, OS::ActivationFrameAlignment()));        \
 }
 #elif defined(TARGET_OS_WINDOWS)
 // The compiler may dynamically align the stack on Windows, so do not check.
@@ skipping 41 matching lines @@
 // Inside the function, arguments are accessed as follows:
 //   const Instance& arg0 = Instance::CheckedHandle(arguments.ArgAt(0));
 //   const Smi& arg1 = Smi::CheckedHandle(arguments.ArgAt(1));
 // The return value is set as follows:
 //   arguments.SetReturn(result);
 // NOTE: Since we pass 'this' as a pass-by-value argument in the stubs we don't
 // have DISALLOW_COPY_AND_ASSIGN in the class definition and do not make it a
 // subclass of ValueObject.
 class NativeArguments {
  public:
-  Isolate* isolate() const { return isolate_; }
+  Thread* thread() const { return thread_; }
   int ArgCount() const { return ArgcBits::decode(argc_tag_); }
 
   RawObject* ArgAt(int index) const {
     ASSERT((index >= 0) && (index < ArgCount()));
     RawObject** arg_ptr = &((*argv_)[-index]);
     // Tell MemorySanitizer the RawObject* was initialized (by generated code).
     MSAN_UNPOISON(arg_ptr, kWordSize);
     return *arg_ptr;
   }
 
@@ skipping 21 matching lines @@
     }
     int function_bits = FunctionBits::decode(argc_tag_);
     const int actual_index = index + NumHiddenArgs(function_bits);
     return ArgAt(actual_index);
   }
 
   void SetReturn(const Object& value) const {
     *retval_ = value.raw();
   }
 
-  static intptr_t isolate_offset() {
-    return OFFSET_OF(NativeArguments, isolate_);
+  static intptr_t thread_offset() {
+    return OFFSET_OF(NativeArguments, thread_);
   }
   static intptr_t argc_tag_offset() {
     return OFFSET_OF(NativeArguments, argc_tag_);
   }
   static intptr_t argv_offset() { return OFFSET_OF(NativeArguments, argv_); }
   static intptr_t retval_offset() {
     return OFFSET_OF(NativeArguments, retval_);
   }
   static intptr_t AutoSetupScopeMask() {
     return AutoSetupScopeBits::mask_in_place();
@@ skipping 72 matching lines @@
     // For static closure functions, the closure at index 0 is hidden.
     // In the instance closure function case, the receiver is accessed from
     // the context and the closure at index 0 is hidden, so the apparent
     // argument count remains unchanged.
     if (function_bits == kClosureFunctionBit) {
       return 1;
     }
     return 0;
   }
 
-  Isolate* isolate_;  // Current isolate pointer.
+  Thread* thread_;  // Current thread pointer.
   int argc_tag_;  // Encodes argument count and invoked native call type.
   RawObject*(*argv_)[];  // Pointer to an array of arguments to runtime call.
   RawObject** retval_;  // Pointer to the return value area.
 };
 
 }  // namespace dart
 
 #endif  // VM_NATIVE_ARGUMENTS_H_