< prev index next >
src/hotspot/share/opto/shenandoahSupport.cpp
Print this page
rev 49096 : [mq]: eliminate_wb_stub.patch
@@ -3755,11 +3755,11 @@
MergeMemNode* mm = MergeMemNode::make(base);
mm->set_memory_at(alias, wb_mem);
mm->set_memory_at(Compile::AliasIdxRaw, raw_mem);
phase->register_new_node(mm, c);
- Node* call = new CallLeafNoFPNode(OptoRuntime::shenandoah_write_barrier_Type(), StubRoutines::shenandoah_wb_C(), "shenandoah_write_barrier", TypeRawPtr::BOTTOM);
+ Node* call = new CallLeafNode(OptoRuntime::shenandoah_write_barrier_Type(), CAST_FROM_FN_PTR(address, ShenandoahBarrierSet::write_barrier_JRT), "shenandoah_write_barrier", TypeRawPtr::BOTTOM);
call->init_req(TypeFunc::Control, c);
call->init_req(TypeFunc::I_O, phase->C->top());
call->init_req(TypeFunc::Memory, mm);
call->init_req(TypeFunc::FramePtr, phase->C->top());
call->init_req(TypeFunc::ReturnAdr, phase->C->top());
@@ -4237,11 +4237,11 @@
Unique_Node_List memories;
nodes.push(root);
for (uint next = 0; next < nodes.size(); next++) {
Node *n = nodes.at(next);
- if (n->Opcode() == Op_CallLeafNoFP && n->as_Call()->_entry_point == StubRoutines::shenandoah_wb_C()) {
+ if (n->Opcode() == Op_CallLeafNoFP && n->as_Call()->_entry_point == CAST_FROM_FN_PTR(address, ShenandoahBarrierSet::write_barrier_JRT)) {
controls.push(n);
if (trace) { tty->print("XXXXXX verifying"); n->dump(); }
for (uint next2 = 0; next2 < controls.size(); next2++) {
Node *m = controls.at(next2);
if (!m->is_Loop() || controls.member(m->in(LoopNode::EntryControl)) || 1) {
< prev index next >