Migrate LongJumpScope to Thread.

runtime/vm/dart_entry.cc

 // Copyright (c) 2011, 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.
 
 #include "vm/dart_entry.h"
 
 #include "vm/class_finalizer.h"
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
 #include "vm/debugger.h"
@@ skipping 37 matching lines @@
       isolate_->ClearStackLimit();
     }
   }
 
  private:
   Isolate* isolate_;
   uword stack_base_;
 };
 
 
-// Clears/restores Isolate::long_jump_base on construction/destruction.
+// Clears/restores Thread::long_jump_base on construction/destruction.
 // Ensures that we do not attempt to long jump across Dart frames.
 class SuspendLongJumpScope : public StackResource {
  public:
-  explicit SuspendLongJumpScope(Isolate* isolate)
-      : StackResource(isolate),
-        saved_long_jump_base_(isolate->long_jump_base()) {
-    isolate->set_long_jump_base(NULL);
+  explicit SuspendLongJumpScope(Thread* thread)
+      : StackResource(thread),
+        saved_long_jump_base_(thread->long_jump_base()) {
+    thread->set_long_jump_base(NULL);
   }
 
   ~SuspendLongJumpScope() {
-    ASSERT(isolate()->long_jump_base() == NULL);
-    isolate()->set_long_jump_base(saved_long_jump_base_);
+    ASSERT(thread()->long_jump_base() == NULL);
+    thread()->set_long_jump_base(saved_long_jump_base_);
   }
 
  private:
   LongJumpScope* saved_long_jump_base_;
 };
 
 
 RawObject* DartEntry::InvokeFunction(const Function& function,
                                      const Array& arguments,
                                      const Array& arguments_descriptor) {
@@ skipping 10 matching lines @@
       return error.raw();
     }
   }
   // Now Call the invoke stub which will invoke the dart function.
   invokestub entrypoint = reinterpret_cast<invokestub>(
       StubCode::InvokeDartCode_entry()->EntryPoint());
   const Code& code = Code::Handle(zone, function.CurrentCode());
   ASSERT(!code.IsNull());
   ASSERT(Isolate::Current()->no_callback_scope_depth() == 0);
   ScopedIsolateStackLimits stack_limit(isolate);
-  SuspendLongJumpScope suspend_long_jump_scope(isolate);
+  SuspendLongJumpScope suspend_long_jump_scope(thread);
 #if defined(USING_SIMULATOR)
 #if defined(ARCH_IS_64_BIT)
   // TODO(zra): Change to intptr_t so we have only one case.
     return bit_copy<RawObject*, int64_t>(Simulator::Current()->Call(
         reinterpret_cast<int64_t>(entrypoint),
         static_cast<int64_t>(code.EntryPoint()),
         reinterpret_cast<int64_t>(&arguments_descriptor),
         reinterpret_cast<int64_t>(&arguments),
         reinterpret_cast<int64_t>(thread)));
 #else
@@ skipping 460 matching lines @@
   const Array& args = Array::Handle(Array::New(kNumArguments));
   args.SetAt(0, map);
   args.SetAt(1, key);
   args.SetAt(2, value);
   const Object& result = Object::Handle(DartEntry::InvokeFunction(function,
                                                                   args));
   return result.raw();
 }
 
 }  // namespace dart