< prev index next >

src/hotspot/share/opto/subnode.cpp

Print this page

        

*** 22,31 **** --- 22,33 ---- * */ #include "precompiled.hpp" #include "compiler/compileLog.hpp" + #include "gc/shared/barrierSet.hpp" + #include "gc/shared/c2/barrierSetC2.hpp" #include "memory/allocation.inline.hpp" #include "opto/addnode.hpp" #include "opto/callnode.hpp" #include "opto/cfgnode.hpp" #include "opto/loopnode.hpp"
*** 878,887 **** --- 880,897 ---- static inline Node* isa_java_mirror_load(PhaseGVN* phase, Node* n) { // Return the klass node for (indirect load from OopHandle) // LoadP(LoadP(AddP(foo:Klass, #java_mirror))) // or NULL if not matching. + + #if INCLUDE_SHENANDOAHGC + if (UseShenandoahGC) { + BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2(); + n = bs->step_over_gc_barrier(n); + } + #endif + if (n->Opcode() != Op_LoadP) return NULL; const TypeInstPtr* tp = phase->type(n)->isa_instptr(); if (!tp || tp->klass() != phase->C->env()->Class_klass()) return NULL;
*** 950,961 **** Node* conk2 = isa_const_java_mirror(phase, in(2)); if (k1 && (k2 || conk2)) { Node* lhs = k1; Node* rhs = (k2 != NULL) ? k2 : conk2; ! this->set_req(1, lhs); ! this->set_req(2, rhs); return this; } } // Constant pointer on right? --- 960,980 ---- Node* conk2 = isa_const_java_mirror(phase, in(2)); if (k1 && (k2 || conk2)) { Node* lhs = k1; Node* rhs = (k2 != NULL) ? k2 : conk2; ! #if INCLUDE_SHENANDOAHGC ! PhaseIterGVN* igvn = phase->is_IterGVN(); ! if (UseShenandoahGC && igvn != NULL) { ! set_req_X(1, lhs, igvn); ! set_req_X(2, rhs, igvn); ! } else ! #endif ! { ! set_req(1, lhs); ! set_req(2, rhs); ! } return this; } } // Constant pointer on right?
< prev index next >