src/hotspot/share/opto/graphKit.cpp

rev 52710 : Upstream/backport Shenandoah to JDK11u

*** 41,50 ****
--- 41,54 ----
  #include "opto/parse.hpp"
  #include "opto/rootnode.hpp"
  #include "opto/runtime.hpp"
  #include "runtime/deoptimization.hpp"
  #include "runtime/sharedRuntime.hpp"
+ #include "utilities/macros.hpp"
+ #if INCLUDE_SHENANDOAHGC
+ #include "gc/shenandoah/c2/shenandoahBarrierSetC2.hpp"
+ #endif
  
  //----------------------------GraphKit-----------------------------------------
  // Main utility constructor.
  GraphKit::GraphKit(JVMState* jvms)
    : Phase(Phase::Parser),
*** 3736,3745 ****
--- 3740,3757 ----
  // Given an oop pointer or raw pointer, see if it feeds from an AllocateNode.
  AllocateNode* AllocateNode::Ideal_allocation(Node* ptr, PhaseTransform* phase) {
    if (ptr == NULL) {     // reduce dumb test in callers
      return NULL;
    }
+ 
+ #if INCLUDE_SHENANDOAHGC
+   if (UseShenandoahGC) {
+     BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
+     ptr = bs->step_over_gc_barrier(ptr);
+   }
+ #endif
+ 
    if (ptr->is_CheckCastPP()) { // strip only one raw-to-oop cast
      ptr = ptr->in(1);
      if (ptr == NULL) return NULL;
    }
    // Return NULL for allocations with several casts: