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

Unified Diff: runtime/vm/isolate.cc

Issue 2016653002: VM: Fix assertion failure from background compiler. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 7 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 | « no previous file | runtime/vm/jit_optimizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/isolate.cc
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
index b184f6cce2a3bbfb3ceff21de569e12dabc6a94f..8ed08737a0cdfbcf2035f1acc675afbb7ab959c8 100644
--- a/runtime/vm/isolate.cc
+++ b/runtime/vm/isolate.cc
@@ -2016,7 +2016,7 @@ void Isolate::set_registered_service_extension_handlers(
void Isolate::AddDeoptimizingBoxedField(const Field& field) {
ASSERT(Compiler::IsBackgroundCompilation());
- ASSERT(field.IsOriginal());
+ ASSERT(!field.IsOriginal());
// The enclosed code allocates objects and can potentially trigger a GC,
// ensure that we account for safepoints when grabbing the lock.
SafepointMutexLocker ml(field_list_mutex_);
@@ -2025,7 +2025,7 @@ void Isolate::AddDeoptimizingBoxedField(const Field& field) {
}
const GrowableObjectArray& array =
GrowableObjectArray::Handle(boxed_field_list_);
- array.Add(field, Heap::kOld);
+ array.Add(Field::Handle(field.Original()), Heap::kOld);
}
« no previous file with comments | « no previous file | runtime/vm/jit_optimizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698