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

Unified Diff: runtime/vm/dart_entry.cc

Issue 1401413002: Move no_callback_scope_depth_ and cha_ from isolate -> thread (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Spelling fix Created 5 years, 2 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/dart_api_impl.cc ('k') | runtime/vm/isolate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/dart_entry.cc
diff --git a/runtime/vm/dart_entry.cc b/runtime/vm/dart_entry.cc
index c0a0ef9afb20ba3d6e8639dc3a3753d72a2c7614..2f5a79ec4bdc7651cf3dd62e855cbdd37e128148 100644
--- a/runtime/vm/dart_entry.cc
+++ b/runtime/vm/dart_entry.cc
@@ -84,6 +84,7 @@ RawObject* DartEntry::InvokeFunction(const Function& function,
Thread* thread = Thread::Current();
Zone* zone = thread->zone();
Isolate* isolate = thread->isolate();
+ ASSERT(isolate->MutatorThreadIsCurrentThread());
if (!function.HasCode()) {
const Error& error = Error::Handle(
zone, Compiler::CompileFunction(thread, function));
@@ -96,7 +97,7 @@ RawObject* DartEntry::InvokeFunction(const Function& function,
StubCode::InvokeDartCode_entry()->EntryPoint());
const Code& code = Code::Handle(zone, function.CurrentCode());
ASSERT(!code.IsNull());
- ASSERT(Isolate::Current()->no_callback_scope_depth() == 0);
+ ASSERT(thread->no_callback_scope_depth() == 0);
ScopedIsolateStackLimits stack_limit(isolate);
SuspendLongJumpScope suspend_long_jump_scope(thread);
#if defined(USING_SIMULATOR)
« no previous file with comments | « runtime/vm/dart_api_impl.cc ('k') | runtime/vm/isolate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698