From 31cfeabc462cb0a98641eba389d8a7207c1f59ec Mon Sep 17 00:00:00 2001
From: Roman Kennke <rkennke@openjdk.org>
Date: Wed, 7 Nov 2018 20:24:44 +0100
Subject: [PATCH] 8213469: Remove/fix leftovers from JDK-8213384: Move G1/C2
 barrier verification into G1BarrierSetC2

Reviewed-by: kvn, roland
---
 src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp | 3 +++
 src/hotspot/share/opto/compile.cpp            | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
index 763e60c3fe..e1155d9c77 100644
--- a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
+++ b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
@@ -778,6 +778,9 @@ Node* G1BarrierSetC2::step_over_gc_barrier(Node* c) const {
 
 #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());
 
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 7349bbc1aa..692596be89 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -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