diff -r 3632cf329763 src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp --- a/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp Fri Nov 10 19:12:11 2017 +0100 +++ b/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp Fri Nov 10 19:32:06 2017 +0100 @@ -39,8 +39,10 @@ virtual void resize_covered_region(MemRegion new_region) {} virtual void print_on(outputStream *st) const {} + template + class AccessBarrier: public BarrierSet::AccessBarrier {}; + protected: - virtual void write_ref_field_work(void *field, oop new_val, bool release) {} virtual void write_ref_array_work(MemRegion mr) {} virtual void write_region_work(MemRegion mr) {} }; @@ -50,4 +52,9 @@ static const BarrierSet::Name value = BarrierSet::Epsilon; }; +template<> +struct BarrierSet::GetType { + typedef EpsilonBarrierSet type; +}; + #endif // SHARE_VM_GC_EPSILON_BARRIERSET_HPP diff -r 3632cf329763 src/hotspot/share/gc/shared/barrierSetConfig.hpp --- a/src/hotspot/share/gc/shared/barrierSetConfig.hpp Fri Nov 10 19:12:11 2017 +0100 +++ b/src/hotspot/share/gc/shared/barrierSetConfig.hpp Fri Nov 10 19:32:06 2017 +0100 @@ -30,7 +30,8 @@ #if INCLUDE_ALL_GCS #define FOR_EACH_CONCRETE_INCLUDE_ALL_GC_BARRIER_SET_DO(f) \ f(CardTableExtension) \ - f(G1SATBCTLogging) + f(G1SATBCTLogging) \ + f(Epsilon) #else #define FOR_EACH_CONCRETE_INCLUDE_ALL_GC_BARRIER_SET_DO(f) #endif @@ -47,7 +48,8 @@ f(CardTableForRS) \ f(CardTableExtension) \ f(G1SATBCT) \ - f(G1SATBCTLogging) + f(G1SATBCTLogging) \ + f(Epsilon) // To enable runtime-resolution of GC barriers on primitives, please // define SUPPORT_BARRIER_ON_PRIMITIVES. diff -r 3632cf329763 src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp --- a/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp Fri Nov 10 19:12:11 2017 +0100 +++ b/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp Fri Nov 10 19:32:06 2017 +0100 @@ -34,6 +34,7 @@ #if INCLUDE_ALL_GCS #include "gc/parallel/cardTableExtension.hpp" // Parallel support #include "gc/g1/g1SATBCardTableModRefBS.inline.hpp" // G1 support +#include "gc/epsilon/epsilonBarrierSet.hpp" #endif #endif // SHARE_VM_GC_SHARED_BARRIERSETCONFIG_INLINE_HPP