8257509: Strengthen requirements to call G1HeapVerifier::verify(Verif…

…yOption) Reviewed-by: sjohanss, ayang
openjdk · Dec 4, 2020 · ca40267 · ca40267 · openjdk-notifier · Dec 4, 2020
1 parent 4a85514
commit ca40267
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/src/hotspot/share/gc/g1/g1HeapVerifier.cpp b/src/hotspot/share/gc/g1/g1HeapVerifier.cpp
@@ -471,12 +471,7 @@ bool G1HeapVerifier::should_verify(G1VerifyType type) {
 }
 
 void G1HeapVerifier::verify(VerifyOption vo) {
-  if (!SafepointSynchronize::is_at_safepoint()) {
-    log_info(gc, verify)("Skipping verification. Not at safepoint.");
-  }
-
-  assert(Thread::current()->is_VM_thread(),
-         "Expected to be executed serially by the VM thread at this point");
+  assert_at_safepoint_on_vm_thread();
 
   log_debug(gc, verify)("Roots");
   VerifyRootsClosure rootsCl(vo);