Skip to content

Commit efb3a05

Browse files
author
William Kemper
committed
8344151: GenShen: Improve comments, clean up unnecessary changes
Reviewed-by: shade
1 parent 1e3b081 commit efb3a05

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.hpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,23 +115,17 @@ class ShenandoahHeuristics : public CHeapObj<mtGC> {
115115
}
116116

117117
inline ShenandoahHeapRegion* get_region() const {
118-
#ifdef ASSERT
119-
assert(_union_tag != is_uninitialized, "Cannot fetch region from uninialized RegionData");
120-
#endif
118+
assert(_union_tag != is_uninitialized, "Cannot fetch region from uninitialized RegionData");
121119
return _region;
122120
}
123121

124122
inline size_t get_garbage() const {
125-
#ifdef ASSERT
126123
assert(_union_tag == is_garbage, "Invalid union fetch");
127-
#endif
128124
return _region_union._garbage;
129125
}
130126

131127
inline size_t get_livedata() const {
132-
#ifdef ASSERT
133128
assert(_union_tag == is_live_data, "Invalid union fetch");
134-
#endif
135129
return _region_union._live_data;
136130
}
137131
};

src/hotspot/share/gc/shenandoah/shenandoahAsserts.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ class ShenandoahAsserts {
235235
#define shenandoah_assert_control_or_vm_thread()
236236
#define shenandoah_assert_control_or_vm_thread_at_safepoint()
237237
#define shenandoah_assert_generational()
238-
#define shenandoah_assert_generations_reconciled() \
238+
#define shenandoah_assert_generations_reconciled()
239239

240240
#endif
241241

src/hotspot/share/gc/shenandoah/shenandoahVMOperations.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class ShenandoahFullGC;
3838
// - VM_ShenandoahFinalMarkStartEvac: finish up concurrent marking, and start evacuation
3939
// - VM_ShenandoahInitUpdateRefs: initiate update references
4040
// - VM_ShenandoahFinalUpdateRefs: finish up update references
41-
// - VM_ShenandoahFinalRoots
41+
// - VM_ShenandoahFinalRoots: finish up roots on a non-evacuating cycle
4242
// - VM_ShenandoahReferenceOperation:
4343
// - VM_ShenandoahFullGC: do full GC
4444
// - VM_ShenandoahDegeneratedGC: do STW degenerated GC

test/hotspot/jtreg/ProblemList.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ gc/TestAlwaysPreTouchBehavior.java#G1 8334513 generic-all
9595
gc/TestAlwaysPreTouchBehavior.java#Z 8334513 generic-all
9696
gc/TestAlwaysPreTouchBehavior.java#Epsilon 8334513 generic-all
9797
gc/stress/gclocker/TestExcessGCLockerCollections.java 8229120 generic-all
98+
9899
#############################################################################
99100

100101
# :hotspot_runtime

0 commit comments

Comments
 (0)