# HG changeset patch # User shade # Date 1528790483 -7200 # Node ID 774caae3a3ce96e18504d59f9bb41bd3519bd46a # Parent 25d779d6bafc4f730647b2b450c8b99a36307671 Cherry-pick 8204850: BarrierSet::make_* should be static diff -r 25d779d6bafc -r 774caae3a3ce src/hotspot/share/gc/shared/barrierSet.hpp --- a/src/hotspot/share/gc/shared/barrierSet.hpp Tue Jun 12 10:52:09 2018 +0200 +++ b/src/hotspot/share/gc/shared/barrierSet.hpp Tue Jun 12 10:01:23 2018 +0200 @@ -103,17 +103,17 @@ ~BarrierSet() { } template - BarrierSetAssembler* make_barrier_set_assembler() { + static BarrierSetAssembler* make_barrier_set_assembler() { return NOT_ZERO(new BarrierSetAssemblerT()) ZERO_ONLY(NULL); } template - BarrierSetC1* make_barrier_set_c1() { + static BarrierSetC1* make_barrier_set_c1() { return COMPILER1_PRESENT(new BarrierSetC1T()) NOT_COMPILER1(NULL); } template - BarrierSetC2* make_barrier_set_c2() { + static BarrierSetC2* make_barrier_set_c2() { return COMPILER2_PRESENT(new BarrierSetC2T()) NOT_COMPILER2(NULL); }