OpenJDK / jdk / jdk
changeset 52442:dc1f9dec2018 jdk-12+19
8213469: Remove/fix leftovers from JDK-8213384: Move G1/C2 barrier verification into G1BarrierSetC2
Reviewed-by: kvn, roland
| author | rkennke |
|---|---|
| date | Wed, 07 Nov 2018 20:24:44 +0100 |
| parents | 6082c529aed8 |
| children | bec2391579f8 |
| files | src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp src/hotspot/share/opto/compile.cpp |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp Wed Nov 07 20:21:35 2018 +0100 +++ b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp Wed Nov 07 20:24:44 2018 +0100 @@ -778,6 +778,9 @@ #ifdef ASSERT void G1BarrierSetC2::verify_gc_barriers(Compile* compile, CompilePhase phase) const { + if (phase != BarrierSetC2::BeforeCodeGen) { + return; + } // Verify G1 pre-barriers const int marking_offset = in_bytes(G1ThreadLocalData::satb_mark_queue_active_offset());
--- a/src/hotspot/share/opto/compile.cpp Wed Nov 07 20:21:35 2018 +0100 +++ b/src/hotspot/share/opto/compile.cpp Wed Nov 07 20:24:44 2018 +0100 @@ -76,9 +76,6 @@ #include "utilities/align.hpp" #include "utilities/copy.hpp" #include "utilities/macros.hpp" -#if INCLUDE_G1GC -#include "gc/g1/g1ThreadLocalData.hpp" -#endif // INCLUDE_G1GC #if INCLUDE_ZGC #include "gc/z/c2/zBarrierSetC2.hpp" #endif