src/hotspot/share/opto/type.cpp

*** 47,13 ***
  #include "utilities/checkedCast.hpp"
  #include "utilities/debug.hpp"
  #include "utilities/ostream.hpp"
  #include "utilities/powerOfTwo.hpp"
  #include "utilities/stringUtils.hpp"
- #if INCLUDE_SHENANDOAHGC
- #include "gc/shenandoah/c2/shenandoahBarrierSetC2.hpp"
- #endif // INCLUDE_SHENANDOAHGC
  
  // Portions of code courtesy of Clifford Click
  
  // Optimization - Graph Style
  
--- 47,10 ---

*** 733,14 ***
    mreg2type[Op_VecD] = TypeVect::VECTD;
    mreg2type[Op_VecX] = TypeVect::VECTX;
    mreg2type[Op_VecY] = TypeVect::VECTY;
    mreg2type[Op_VecZ] = TypeVect::VECTZ;
  
- #if INCLUDE_SHENANDOAHGC
-   ShenandoahBarrierSetC2::init();
- #endif //INCLUDE_SHENANDOAHGC
- 
    BarrierSetC2::make_clone_type();
    LockNode::initialize_lock_Type();
    ArrayCopyNode::initialize_arraycopy_Type();
    OptoRuntime::initialize_types();
  
--- 730,10 ---