--- old/src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.cpp	2018-04-12 10:20:20.088929836 +0200
+++ new/src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.cpp	2018-04-12 10:20:19.887921154 +0200
@@ -29,7 +29,6 @@
 #include "gc/g1/g1BarrierSetAssembler.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
 #include "gc/g1/heapRegion.hpp"
-#include "gc/shared/collectedHeap.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "utilities/macros.hpp"
@@ -362,7 +361,7 @@
 
   if (new_val == G0) return;
 
-  G1BarrierSet* bs = barrier_set_cast<G1BarrierSet>(Universe::heap()->barrier_set());
+  G1BarrierSet* bs = barrier_set_cast<G1BarrierSet>(BarrierSet::barrier_set());
 
   if (G1RSBarrierRegionFilter) {
     __ xor3(store_addr, new_val, tmp);