runtime/vm/raw_object_snapshot.cc - Issue 1250463004: Migrate NoSafepointScope; add constrained concurrent allocation to unit test

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: runtime/vm/raw_object_snapshot.cc

Issue 1250463004: Migrate NoSafepointScope; add constrained concurrent allocation to unit test (Closed) Base URL: git@github.com:dart-lang/sdk.git@master

Patch Set: Assert current thread is mutator; add shared assertion macro. Created 5 years, 5 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

Index: runtime/vm/raw_object_snapshot.cc

diff --git a/runtime/vm/raw_object_snapshot.cc b/runtime/vm/raw_object_snapshot.cc

index 057f8e94aad173404a312fd080aead519a4baf17..7bdb3a2ac31ed2c4213730f4b71ad430764dedb3 100644

--- a/runtime/vm/raw_object_snapshot.cc

+++ b/runtime/vm/raw_object_snapshot.cc

@@ -2059,7 +2059,9 @@ RawOneByteString* OneByteString::ReadFrom(SnapshotReader* reader,

String& str_obj = String::Handle(reader->zone(), String::null());

if (kind == Snapshot::kFull) {

- ASSERT(reader->isolate()->no_safepoint_scope_depth() != 0);

+ // We currently only expect the Dart mutator to read snapshots.

+ reader->isolate()->AssertCurrentThreadIsMutator();

+ ASSERT(Thread::Current()->no_safepoint_scope_depth() != 0);

RawOneByteString* obj = reader->NewOneByteString(len);

str_obj = obj;

str_obj.set_tags(tags);

« no previous file with comments | « runtime/vm/object_graph.cc ('k') | runtime/vm/snapshot.cc » ('j') | no next file with comments »