Skip to content

Commit a169c06

Browse files
committed
8329580: Parallel: Remove VerifyObjectStartArray
Reviewed-by: tschatzl, gli
1 parent 8efd7aa commit a169c06

File tree

6 files changed

+2
-48
lines changed

6 files changed

+2
-48
lines changed

src/hotspot/share/gc/parallel/psOldGen.cpp

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -377,24 +377,6 @@ void PSOldGen::verify() {
377377
object_space()->verify();
378378
}
379379

380-
class VerifyObjectStartArrayClosure : public ObjectClosure {
381-
ObjectStartArray* _start_array;
382-
383-
public:
384-
VerifyObjectStartArrayClosure(ObjectStartArray* start_array) :
385-
_start_array(start_array) { }
386-
387-
virtual void do_object(oop obj) {
388-
HeapWord* test_addr = cast_from_oop<HeapWord*>(obj) + 1;
389-
guarantee(_start_array->object_start(test_addr) == cast_from_oop<HeapWord*>(obj), "ObjectStartArray cannot find start of object");
390-
}
391-
};
392-
393-
void PSOldGen::verify_object_start_array() {
394-
VerifyObjectStartArrayClosure check(&_start_array);
395-
object_iterate(&check);
396-
}
397-
398380
#ifndef PRODUCT
399381
void PSOldGen::record_spaces_top() {
400382
assert(ZapUnusedHeapArea, "Not mangling unused space");

src/hotspot/share/gc/parallel/psOldGen.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ class PSOldGen : public CHeapObj<mtGC> {
149149
virtual void print_on(outputStream* st) const;
150150

151151
void verify();
152-
void verify_object_start_array();
153152

154153
// Performance Counter support
155154
void update_counters();

src/hotspot/share/gc/parallel/psParallelCompact.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -913,12 +913,6 @@ void PSParallelCompact::pre_compact()
913913
Universe::verify("Before GC");
914914
}
915915

916-
// Verify object start arrays
917-
if (VerifyObjectStartArray &&
918-
VerifyBeforeGC) {
919-
heap->old_gen()->verify_object_start_array();
920-
}
921-
922916
DEBUG_ONLY(mark_bitmap()->verify_clear();)
923917
DEBUG_ONLY(summary_data().verify_clear();)
924918

@@ -1535,12 +1529,6 @@ bool PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) {
15351529
Universe::verify("After GC");
15361530
}
15371531

1538-
// Re-verify object start arrays
1539-
if (VerifyObjectStartArray &&
1540-
VerifyAfterGC) {
1541-
old_gen->verify_object_start_array();
1542-
}
1543-
15441532
if (ZapUnusedHeapArea) {
15451533
old_gen->object_space()->check_mangled_unused_area_complete();
15461534
}

src/hotspot/share/gc/parallel/psScavenge.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -419,12 +419,6 @@ bool PSScavenge::invoke_no_policy() {
419419
// Let the size policy know we're starting
420420
size_policy->minor_collection_begin();
421421

422-
// Verify the object start arrays.
423-
if (VerifyObjectStartArray &&
424-
VerifyBeforeGC) {
425-
old_gen->verify_object_start_array();
426-
}
427-
428422
// Verify no unmarked old->young roots
429423
if (VerifyRememberedSets) {
430424
heap->card_table()->verify_all_young_refs_imprecise();
@@ -634,12 +628,6 @@ bool PSScavenge::invoke_no_policy() {
634628
DerivedPointerTable::update_pointers();
635629
#endif
636630

637-
// Re-verify object start arrays
638-
if (VerifyObjectStartArray &&
639-
VerifyAfterGC) {
640-
old_gen->verify_object_start_array();
641-
}
642-
643631
if (VerifyRememberedSets) {
644632
heap->card_table()->verify_all_young_refs_imprecise();
645633
}

src/hotspot/share/gc/shared/gc_globals.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -500,9 +500,6 @@
500500
product(bool, VerifyRememberedSets, false, DIAGNOSTIC, \
501501
"Verify GC remembered sets") \
502502
\
503-
product(bool, VerifyObjectStartArray, true, DIAGNOSTIC, \
504-
"Verify GC object start array if verify before/after") \
505-
\
506503
product(bool, DisableExplicitGC, false, \
507504
"Ignore calls to System.gc()") \
508505
\

test/hotspot/jtreg/gc/g1/TestVerificationInConcurrentCycle.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
3737
* -XX:+VerifyBeforeGC -XX:+VerifyDuringGC -XX:+VerifyAfterGC
3838
* -XX:+UseG1GC -XX:+G1VerifyHeapRegionCodeRoots
39-
* -XX:+VerifyRememberedSets -XX:+VerifyObjectStartArray
39+
* -XX:+VerifyRememberedSets
4040
* -XX:+G1VerifyBitmaps
4141
* gc.g1.TestVerificationInConcurrentCycle
4242
*/
@@ -55,7 +55,7 @@
5555
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
5656
* -XX:+VerifyBeforeGC -XX:+VerifyDuringGC -XX:+VerifyAfterGC
5757
* -XX:+UseG1GC -XX:+G1VerifyHeapRegionCodeRoots
58-
* -XX:+VerifyRememberedSets -XX:+VerifyObjectStartArray
58+
* -XX:+VerifyRememberedSets
5959
* gc.g1.TestVerificationInConcurrentCycle
6060
*/
6161

0 commit comments

Comments
 (0)