src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp

G1BarrierSet_merge

*** 1,7 ****
  /*
!  * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
***************
*** 32,42 ****
  #include "nativeInst_arm.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "utilities/macros.hpp"
  #include "vmreg_arm.inline.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #endif // INCLUDE_ALL_GCS
  
  #define __ ce->masm()->
  
  void CounterOverflowStub::emit_code(LIR_Assembler* ce) {
--- 32,42 ----
  #include "nativeInst_arm.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "utilities/macros.hpp"
  #include "vmreg_arm.inline.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc/g1/g1BarrierSet.hpp"
  #endif // INCLUDE_ALL_GCS
  
  #define __ ce->masm()->
  
  void CounterOverflowStub::emit_code(LIR_Assembler* ce) {