Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(626)

Unified Diff: runtime/vm/longjump.cc

Issue 1299653003: Migrate LongJumpScope to Thread. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Assert current isolate. Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/longjump.h ('k') | runtime/vm/longjump_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/longjump.cc
diff --git a/runtime/vm/longjump.cc b/runtime/vm/longjump.cc
index 66de5afecfff644bc9ecdfadd711dd835ba5457f..10a33db8cc8b1dc0da1fc1f3f6f52f359b09083a 100644
--- a/runtime/vm/longjump.cc
+++ b/runtime/vm/longjump.cc
@@ -17,7 +17,7 @@ namespace dart {
jmp_buf* LongJumpScope::Set() {
ASSERT(top_ == NULL);
- top_ = Isolate::Current()->top_resource();
+ top_ = Thread::Current()->top_resource();
return &environment_;
}
@@ -25,12 +25,16 @@ jmp_buf* LongJumpScope::Set() {
bool LongJumpScope::IsSafeToJump() {
// We do not want to jump past Dart frames. Note that this code
// assumes the stack grows from high to low.
- Isolate* isolate = Isolate::Current();
+ Thread* thread = Thread::Current();
uword jumpbuf_addr = Isolate::GetCurrentStackPointer();
#if defined(USING_SIMULATOR)
- uword top_exit_frame_info = isolate->simulator()->top_exit_frame_info();
+ {
+ Isolate* isolate = thread->isolate();
+ ASSERT(isolate->MutatorThreadIsCurrentThread());
+ uword top_exit_frame_info = isolate->simulator()->top_exit_frame_info();
+ }
#else
- uword top_exit_frame_info = isolate->top_exit_frame_info();
+ uword top_exit_frame_info = thread->top_exit_frame_info();
#endif
return ((top_exit_frame_info == 0) || (jumpbuf_addr < top_exit_frame_info));
}
« no previous file with comments | « runtime/vm/longjump.h ('k') | runtime/vm/longjump_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698