languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-05 00:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Trun on canonical objects verification after reload (still have one workaround for immutable arrays, which is related to the enum issue).

Browse source 
R=johnmccutchan@google.com

Review URL: https://codereview.chromium.org/2201473002 .
This commit is contained in:
Siva Annamalai 2016-08-01 17:07:43 -07:00
parent 647d6f3603
commit 714cd8ee6b
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
runtime/vm/isolate.cc
View file

@ -1098,19 +1098,25 @@ void Isolate::ReportReloadError(const Error& error) {
bool Isolate::ReloadSources(JSONStream* js,
bool force_reload,
bool dont_delete_reload_context) {
// TODO(asiva): Add verification of canonical objects.
ASSERT(!IsReloading());
has_attempted_reload_ = true;
reload_context_ = new IsolateReloadContext(this, js);
reload_context_->StartReload(force_reload);
bool success = !reload_context_->has_error();
// TODO(asiva): Add verification of canonical objects.
if (dont_delete_reload_context) {
// Unit tests use the reload context later. Caller is responsible
// for deleting the context.
return success;
// Unit tests use the reload context later. Caller is responsible
// for deleting the context.
if (!dont_delete_reload_context) {
DeleteReloadContext();
}
DeleteReloadContext();
#if defined(DEBUG)
if (success) {
Thread* thread = Thread::Current();
Isolate* isolate = thread->isolate();
isolate->heap()->CollectAllGarbage();
VerifyCanonicalVisitor check_canonical(thread);
isolate->heap()->IterateObjects(&check_canonical);
}
#endif // DEBUG
return success;
}

6
runtime/vm/object.cc
View file

@ -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