Trun on canonical objects verification after reload (still have one workaround for immutable arrays…

runtime/vm/isolate.cc

Index: runtime/vm/isolate.cc
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
index c743fae446206b5c287d138a331ff82cb42b8794..3de4593c509835435b0b947070b505cf25202c48 100644
--- a/runtime/vm/isolate.cc
+++ b/runtime/vm/isolate.cc
@@ -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;
 }