Version 2.19.0-325.0.dev

Merge a9915dd into dev

Author: Dart CI

runtime/tests/vm/dart/splay_ephemeron_test.dart

@@ -27,6 +27,7 @@
 // VMOptions=--verify_after_gc
 // VMOptions=--verify_before_gc --verify_after_gc
 // VMOptions=--verify_store_buffer
+// VMOptions=--verify_after_marking
 // VMOptions=--stress_write_barrier_elimination
 // VMOptions=--old_gen_heap_size=150
 

runtime/tests/vm/dart/splay_test.dart

@@ -25,6 +25,7 @@
 // VMOptions=--verify_after_gc
 // VMOptions=--verify_before_gc --verify_after_gc
 // VMOptions=--verify_store_buffer
+// VMOptions=--verify_after_marking
 // VMOptions=--stress_write_barrier_elimination
 // VMOptions=--old_gen_heap_size=100
 // VMOptions=--mark_when_idle

runtime/tests/vm/dart_2/splay_ephemeron_test.dart

@@ -31,6 +31,7 @@
 // VMOptions=--verify_after_gc
 // VMOptions=--verify_before_gc --verify_after_gc
 // VMOptions=--verify_store_buffer
+// VMOptions=--verify_after_marking
 // VMOptions=--stress_write_barrier_elimination
 // VMOptions=--old_gen_heap_size=150
 

runtime/tests/vm/dart_2/splay_test.dart

@@ -29,6 +29,7 @@
 // VMOptions=--verify_after_gc
 // VMOptions=--verify_before_gc --verify_after_gc
 // VMOptions=--verify_store_buffer
+// VMOptions=--verify_after_marking
 // VMOptions=--stress_write_barrier_elimination
 // VMOptions=--old_gen_heap_size=100
 // VMOptions=--mark_when_idle

runtime/vm/flag_list.h

@@ -241,6 +241,8 @@ constexpr bool FLAG_support_il_printer = false;
     "Enables heap verification before GC.")                                    \
   R(verify_store_buffer, false, bool, false,                                   \
     "Enables store buffer verification before and after scavenges.")           \
+  R(verify_after_marking, false, bool, false,                                  \
+    "Enables heap verification after marking.")                                \
   P(enable_slow_path_sharing, bool, true, "Enable sharing of slow-path code.") \
   P(shared_slow_path_triggers_gc, bool, false,                                 \
     "TESTING: slow-path triggers a GC.")                                       \

runtime/vm/heap/heap.h

@@ -390,6 +390,7 @@ class Heap {
   friend class ProgramReloadContext;  // VisitObjects
   friend class ClassFinalizer;        // VisitObjects
   friend class HeapIterationScope;    // VisitObjects
+  friend class GCMarker;              // VisitObjects
   friend class ProgramVisitor;        // VisitObjectsImagePages
   friend class Serializer;            // VisitObjectsImagePages
   friend class HeapTestHelper;

runtime/vm/heap/marker.cc

@@ -988,6 +988,43 @@ void GCMarker::IncrementalMarkWithTimeBudget(PageSpace* page_space,
   }
 }
 
+class VerifyAfterMarkingVisitor : public ObjectVisitor,
+                                  public ObjectPointerVisitor {
+ public:
+  VerifyAfterMarkingVisitor()
+      : ObjectVisitor(), ObjectPointerVisitor(IsolateGroup::Current()) {}
+
+  void VisitObject(ObjectPtr obj) {
+    if (obj->IsNewObject() || obj->untag()->IsMarked()) {
+      obj->untag()->VisitPointers(this);
+    }
+  }
+
+  void VisitPointers(ObjectPtr* from, ObjectPtr* to) {
+    for (ObjectPtr* ptr = from; ptr <= to; ptr++) {
+      ObjectPtr obj = *ptr;
+      if (obj->IsHeapObject() && obj->IsOldObject() &&
+          !obj->untag()->IsMarked()) {
+        FATAL("Not marked: *0x%" Px " = 0x%" Px "\n",
+              reinterpret_cast<uword>(ptr), static_cast<uword>(obj));
+      }
+    }
+  }
+
+  void VisitCompressedPointers(uword heap_base,
+                               CompressedObjectPtr* from,
+                               CompressedObjectPtr* to) {
+    for (ObjectPtr* ptr = from; ptr <= to; ptr++) {
+      ObjectPtr obj = ptr->Decompress(heap_base);
+      if (obj->IsHeapObject() && obj->IsOldObject() &&
+          !obj->untag()->IsMarked()) {
+        FATAL("Not marked: *0x%" Px " = 0x%" Px "\n",
+              reinterpret_cast<uword>(ptr), static_cast<uword>(obj));
+      }
+    }
+  }
+};
+
 void GCMarker::MarkObjects(PageSpace* page_space) {
   if (isolate_group_->marking_stack() != NULL) {
     isolate_group_->DisableIncrementalBarrier();
@@ -1073,6 +1110,16 @@ void GCMarker::MarkObjects(PageSpace* page_space) {
       ASSERT(global_list_.IsEmpty());
     }
   }
+
+  // Separate from verify_after_gc because that verification interferes with
+  // concurrent marking.
+  if (FLAG_verify_after_marking) {
+    OS::PrintErr("Verifying after marking...");
+    VerifyAfterMarkingVisitor visitor;
+    heap_->VisitObjects(&visitor);
+    OS::PrintErr(" done.\n");
+  }
+
   Epilogue();
 }
 

tools/VERSION

@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 2
 MINOR 19
 PATCH 0
-PRERELEASE 324
+PRERELEASE 325
 PRERELEASE_PATCH 0