src/hotspot/cpu/arm/c1_Runtime1_arm.cpp

G1BarrierSet_merge

*** 41,52 ****
  #include "runtime/signature.hpp"
  #include "runtime/vframeArray.hpp"
  #include "utilities/align.hpp"
  #include "vmreg_arm.inline.hpp"
  #if INCLUDE_ALL_GCS
  #include "gc/g1/g1CardTable.hpp"
- #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #endif
  
  // Note: Rtemp usage is this file should not impact C2 and should be
  // correct as long as it is not implicitly used in lower layers (the
  // arm [macro]assembler) and used with care in the other C1 specific
--- 41,52 ----
  #include "runtime/signature.hpp"
  #include "runtime/vframeArray.hpp"
  #include "utilities/align.hpp"
  #include "vmreg_arm.inline.hpp"
  #if INCLUDE_ALL_GCS
+ #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1CardTable.hpp"
  #endif
  
  // Note: Rtemp usage is this file should not impact C2 and should be
  // correct as long as it is not implicitly used in lower layers (the
  // arm [macro]assembler) and used with care in the other C1 specific