src/hotspot/cpu/x86/assembler_x86.cpp

G1BarrierSet_merge

*** 36,47 ****
  #include "runtime/os.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stubRoutines.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
  #include "gc/g1/g1CollectedHeap.inline.hpp"
- #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #include "gc/g1/heapRegion.hpp"
  #endif // INCLUDE_ALL_GCS
  
  #ifdef PRODUCT
  #define BLOCK_COMMENT(str) /* nothing */
--- 36,47 ----
  #include "runtime/os.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stubRoutines.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
+ #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/heapRegion.hpp"
  #endif // INCLUDE_ALL_GCS
  
  #ifdef PRODUCT
  #define BLOCK_COMMENT(str) /* nothing */