src/hotspot/cpu/arm/interp_masm_arm.cpp

G1BarrierSet_merge

*** 41,52 ****
  #include "runtime/basicLock.hpp"
  #include "runtime/biasedLocking.hpp"
  #include "runtime/sharedRuntime.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
  
  //--------------------------------------------------------------------
  // Implementation of InterpreterMacroAssembler
--- 41,52 ----
  #include "runtime/basicLock.hpp"
  #include "runtime/biasedLocking.hpp"
  #include "runtime/sharedRuntime.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
  
  //--------------------------------------------------------------------
  // Implementation of InterpreterMacroAssembler