src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp

G1BarrierSet_merge

*** 1,7 ****
  /*
!  * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2012, 2015 SAP SE. 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
--- 1,7 ----
  /*
!  * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2012, 2015 SAP SE. 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
***************
*** 32,42 ****
  #include "nativeInst_ppc.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "utilities/macros.hpp"
  #include "vmreg_ppc.inline.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #endif // INCLUDE_ALL_GCS
  
  #define __ ce->masm()->
  
  
--- 32,42 ----
  #include "nativeInst_ppc.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "utilities/macros.hpp"
  #include "vmreg_ppc.inline.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc/g1/g1BarrierSet.hpp"
  #endif // INCLUDE_ALL_GCS
  
  #define __ ce->masm()->