src/share/vm/opto/graphKit.cpp

rev 10764 : [backport] Rename BrooksPointer to ShenandoahBrooksPointer
rev 10800 : JDK8u-only: Use WB-based acmp barrier

@@ -25,11 +25,11 @@
 #include "precompiled.hpp"
 #include "compiler/compileLog.hpp"
 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
 #include "gc_implementation/g1/heapRegion.hpp"
 #include "gc_interface/collectedHeap.hpp"
-#include "gc_implementation/shenandoah/brooksPointer.hpp"
+#include "gc_implementation/shenandoah/shenandoahBrooksPointer.hpp"
 #include "gc_implementation/shenandoah/shenandoahHeap.hpp"
 #include "memory/barrierSet.hpp"
 #include "memory/cardTableModRefBS.hpp"
 #include "opto/addnode.hpp"
 #include "opto/graphKit.hpp"

@@ -4253,14 +4253,10 @@
 
 Node* GraphKit::shenandoah_read_barrier_storeval(Node* obj) {
   return shenandoah_read_barrier_impl(obj, true, false, false);
 }
 
-Node* GraphKit::shenandoah_read_barrier_acmp(Node* obj) {
-  return shenandoah_read_barrier_impl(obj, true, true, false);
-}
-
 Node* GraphKit::shenandoah_read_barrier_impl(Node* obj, bool use_ctrl, bool use_mem, bool allow_fromspace) {
 
   if (UseShenandoahGC && ShenandoahReadBarrier) {
     const Type* obj_type = obj->bottom_type();
     if (obj_type->higher_equal(TypePtr::NULL_PTR)) {