--- a/hotspot/src/share/vm/runtime/thread.cpp Thu Apr 04 21:15:43 2013 -0700
+++ b/hotspot/src/share/vm/runtime/thread.cpp Fri Apr 05 10:20:04 2013 -0700
@@ -3446,9 +3446,9 @@
}
assert (Universe::is_fully_initialized(), "not initialized");
- if (VerifyBeforeGC && VerifyGCStartAt == 0) {
- Universe::heap()->prepare_for_verify();
- Universe::verify(); // make sure we're starting with a clean slate
+ if (VerifyDuringStartup) {
+ VM_Verify verify_op(false /* silent */); // make sure we're starting with a clean slate
+ VMThread::execute(&verify_op);
}
EXCEPTION_MARK;