src/hotspot/share/opto/memnode.cpp

rev 52710 : Upstream/backport Shenandoah to JDK11u

*** 50,59 ****
--- 50,62 ----
  #include "utilities/macros.hpp"
  #include "utilities/vmError.hpp"
  #if INCLUDE_ZGC
  #include "gc/z/c2/zBarrierSetC2.hpp"
  #endif
+ #if INCLUDE_SHENANDOAHGC
+ #include "gc/shenandoah/c2/shenandoahBarrierSetC2.hpp"
+ #endif
  
  // Portions of code courtesy of Clifford Click
  
  // Optimization - Graph Style
  
*** 1110,1119 ****
--- 1113,1127 ----
      // Load boxed value from result of valueOf() call is input parameter.
      if (this->is_Load() && ld_adr->is_AddP() &&
          (tp != NULL) && tp->is_ptr_to_boxed_value()) {
        intptr_t ignore = 0;
        Node* base = AddPNode::Ideal_base_and_offset(ld_adr, phase, ignore);
+ #if INCLUDE_SHENANDOAHGC
+       if (UseShenandoahGC) {
+         base = ((ShenandoahBarrierSetC2*) BarrierSet::barrier_set()->barrier_set_c2())->step_over_gc_barrier(base);
+       }
+ #endif
        if (base != NULL && base->is_Proj() &&
            base->as_Proj()->_con == TypeFunc::Parms &&
            base->in(0)->is_CallStaticJava() &&
            base->in(0)->as_CallStaticJava()->is_boxing_method()) {
          return base->in(0)->in(TypeFunc::Parms);