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

Unified Diff: runtime/vm/become.cc

Issue 2179983002: Implemented schema change for the isolate reload operation. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Final CL review changes. 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
« no previous file with comments | « runtime/vm/become.h ('k') | runtime/vm/isolate_reload.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/become.cc
diff --git a/runtime/vm/become.cc b/runtime/vm/become.cc
index 13b7439accd58ecbbc1320fcf81d9c8c70725606..a4d9fd1e5847bfa20f5d77b1d3b6b5049c2e1523 100644
--- a/runtime/vm/become.cc
+++ b/runtime/vm/become.cc
@@ -148,6 +148,17 @@ class ForwardHeapPointersHandleVisitor : public HandleVisitor {
};
+void Become::MakeDummyObject(const Instance& instance) {
+ // Make the forward pointer point to itself.
+ // This is needed to distinguish it from a real forward object.
+ ForwardObjectTo(instance.raw(), instance.raw());
+}
+
+static bool IsDummyObject(RawObject* object) {
+ if (!object->IsForwardingCorpse()) return false;
+ return GetForwardedObject(object) == object;
+}
+
void Become::ElementsForwardIdentity(const Array& before, const Array& after) {
Thread* thread = Thread::Current();
Isolate* isolate = thread->isolate();
@@ -174,7 +185,7 @@ void Become::ElementsForwardIdentity(const Array& before, const Array& after) {
if (before_obj->IsVMHeapObject()) {
FATAL("become: Cannot forward VM heap objects");
}
- if (before_obj->IsForwardingCorpse()) {
+ if (before_obj->IsForwardingCorpse() && !IsDummyObject(before_obj)) {
FATAL("become: Cannot forward to multiple targets");
}
if (after_obj->IsForwardingCorpse()) {
« no previous file with comments | « runtime/vm/become.h ('k') | runtime/vm/isolate_reload.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698