src/hotspot/share/gc/shared/barrierSetConfig.hpp

G1BarrierSet_merge

*** 27,56 ****
  
  #include "utilities/macros.hpp"
  
  #if INCLUDE_ALL_GCS
  #define FOR_EACH_CONCRETE_INCLUDE_ALL_GC_BARRIER_SET_DO(f) \
!   f(G1SATBCTLogging)
  #else
  #define FOR_EACH_CONCRETE_INCLUDE_ALL_GC_BARRIER_SET_DO(f)
  #endif
  
- #if INCLUDE_ALL_GCS
- #define FOR_EACH_ABSTRACT_INCLUDE_ALL_GC_BARRIER_SET_DO(f) \
-   f(G1SATBCT)
- #else
- #define FOR_EACH_ABSTRACT_INCLUDE_ALL_GC_BARRIER_SET_DO(f)
- #endif
- 
  // Do something for each concrete barrier set part of the build.
  #define FOR_EACH_CONCRETE_BARRIER_SET_DO(f)          \
    f(CardTableModRef)                                 \
    FOR_EACH_CONCRETE_INCLUDE_ALL_GC_BARRIER_SET_DO(f)
  
  #define FOR_EACH_ABSTRACT_BARRIER_SET_DO(f)          \
!   f(ModRef)                                          \
!   FOR_EACH_ABSTRACT_INCLUDE_ALL_GC_BARRIER_SET_DO(f)
  
  // Do something for each known barrier set.
  #define FOR_EACH_BARRIER_SET_DO(f)    \
    FOR_EACH_ABSTRACT_BARRIER_SET_DO(f) \
    FOR_EACH_CONCRETE_BARRIER_SET_DO(f)
--- 27,48 ----
  
  #include "utilities/macros.hpp"
  
  #if INCLUDE_ALL_GCS
  #define FOR_EACH_CONCRETE_INCLUDE_ALL_GC_BARRIER_SET_DO(f) \
!   f(G1BarrierSet)
  #else
  #define FOR_EACH_CONCRETE_INCLUDE_ALL_GC_BARRIER_SET_DO(f)
  #endif
  
  // Do something for each concrete barrier set part of the build.
  #define FOR_EACH_CONCRETE_BARRIER_SET_DO(f)          \
    f(CardTableModRef)                                 \
    FOR_EACH_CONCRETE_INCLUDE_ALL_GC_BARRIER_SET_DO(f)
  
  #define FOR_EACH_ABSTRACT_BARRIER_SET_DO(f)          \
!   f(ModRef)
  
  // Do something for each known barrier set.
  #define FOR_EACH_BARRIER_SET_DO(f)    \
    FOR_EACH_ABSTRACT_BARRIER_SET_DO(f) \
    FOR_EACH_CONCRETE_BARRIER_SET_DO(f)