runtime/vm/object.cc - Issue 2201473002: Trun on canonical objects verification after reload (still have one workaround for immutable arrays…

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/object.cc

Issue 2201473002: Trun on canonical objects verification after reload (still have one workaround for immutable arrays… (Closed) Base URL: git@github.com:dart-lang/sdk.git@master

Patch Set: Address code review comments. Created 4 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/object.cc

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

index 2f062f1b8d64168bf484fd9b0265b64cc43a8d52..0506fa71f79522b0c228df80dd2d29b6e506a034 100644

--- a/runtime/vm/object.cc

+++ b/runtime/vm/object.cc

@@ -15325,6 +15325,12 @@ bool Instance::CheckIsCanonical(Thread* thread) const {

const Class& cls = Class::Handle(zone, this->clazz());

SafepointMutexLocker ml(isolate->constant_canonicalization_mutex());

result ^= cls.LookupCanonicalInstance(zone, *this);

+ // TODO(johnmccutchan) : Temporary workaround for issue (26988).

+ if ((result.raw() != raw()) &&

+ isolate->HasAttemptedReload() &&

+ (GetClassId() == kImmutableArrayCid)) {

+ return true;

+ }

return (result.raw() == this->raw());

}

#endif // DEBUG

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