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

Unified Diff: runtime/vm/native_entry.cc

Issue 2411453003: Fix --verify-on-transition for OSR and concurrent sweep. (Closed)
Patch Set: Created 4 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/native_arguments.h ('k') | runtime/vm/object.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/native_entry.cc
diff --git a/runtime/vm/native_entry.cc b/runtime/vm/native_entry.cc
index fadde0b3ce238619172112f47143433944e65b19..e56bfa8eb73409f4f19d10af3a145845b4baa911 100644
--- a/runtime/vm/native_entry.cc
+++ b/runtime/vm/native_entry.cc
@@ -133,6 +133,7 @@ void NativeEntry::NativeCallWrapperNoStackCheck(Dart_NativeArguments args,
/* Tell MemorySanitizer 'arguments' is initialized by generated code. */
MSAN_UNPOISON(arguments, sizeof(*arguments));
Thread* thread = arguments->thread();
+ ASSERT(thread->execution_state() == Thread::kThreadInGenerated);
if (!arguments->IsNativeAutoSetupScope()) {
TransitionGeneratedToNative transition(thread);
func(args);
@@ -174,8 +175,9 @@ void NativeEntry::NativeCallWrapperNoStackCheck(Dart_NativeArguments args,
delete scope;
}
DEOPTIMIZE_ALOT;
- VERIFY_ON_TRANSITION;
}
+ ASSERT(thread->execution_state() == Thread::kThreadInGenerated);
+ VERIFY_ON_TRANSITION;
}
« no previous file with comments | « runtime/vm/native_arguments.h ('k') | runtime/vm/object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698