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

Side by Side Diff: runtime/vm/longjump.cc

Issue 1415753004: Fix build break, ensure the simulator is created and setup before accessing it in LongJumpScope::Is… (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/longjump.h" 5 #include "vm/longjump.h"
6 6
7 #include "include/dart_api.h" 7 #include "include/dart_api.h"
8 8
9 #include "vm/dart_api_impl.h" 9 #include "vm/dart_api_impl.h"
10 #include "vm/isolate.h" 10 #include "vm/isolate.h"
(...skipping 10 matching lines...) Expand all
21 return &environment_; 21 return &environment_;
22 } 22 }
23 23
24 24
25 bool LongJumpScope::IsSafeToJump() { 25 bool LongJumpScope::IsSafeToJump() {
26 // We do not want to jump past Dart frames. Note that this code 26 // We do not want to jump past Dart frames. Note that this code
27 // assumes the stack grows from high to low. 27 // assumes the stack grows from high to low.
28 Thread* thread = Thread::Current(); 28 Thread* thread = Thread::Current();
29 uword jumpbuf_addr = Isolate::GetCurrentStackPointer(); 29 uword jumpbuf_addr = Isolate::GetCurrentStackPointer();
30 #if defined(USING_SIMULATOR) 30 #if defined(USING_SIMULATOR)
31 Isolate* isolate = thread->isolate(); 31 Simulator* sim = Simulator::Current();
32 uword top_exit_frame_info = isolate->simulator()->top_exit_frame_info(); 32 uword top_exit_frame_info = sim->top_exit_frame_info();
33 #else 33 #else
34 uword top_exit_frame_info = thread->top_exit_frame_info(); 34 uword top_exit_frame_info = thread->top_exit_frame_info();
35 #endif 35 #endif
36 if (!thread->IsMutatorThread()) { 36 if (!thread->IsMutatorThread()) {
37 // A helper thread does not execute Dart code, so it's safe to jump. 37 // A helper thread does not execute Dart code, so it's safe to jump.
38 ASSERT(top_exit_frame_info == 0); 38 ASSERT(top_exit_frame_info == 0);
39 return true; 39 return true;
40 } 40 }
41 return ((top_exit_frame_info == 0) || (jumpbuf_addr < top_exit_frame_info)); 41 return ((top_exit_frame_info == 0) || (jumpbuf_addr < top_exit_frame_info));
42 } 42 }
(...skipping 18 matching lines...) Expand all
61 // Remember the error in the sticky error of this isolate. 61 // Remember the error in the sticky error of this isolate.
62 isolate->object_store()->set_sticky_error(error); 62 isolate->object_store()->set_sticky_error(error);
63 63
64 // Destruct all the active StackResource objects. 64 // Destruct all the active StackResource objects.
65 StackResource::UnwindAbove(thread, top_); 65 StackResource::UnwindAbove(thread, top_);
66 longjmp(environment_, value); 66 longjmp(environment_, value);
67 UNREACHABLE(); 67 UNREACHABLE();
68 } 68 }
69 69
70 } // namespace dart 70 } // namespace dart
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698