8265322: C2: Simplify control inputs for BarrierSetC2::obj_allocate · openjdk/jdk@001c514 (original) (raw)
`@@ -700,7 +700,7 @@ void BarrierSetC2::clone(GraphKit* kit, Node* src_base, Node* dst_base, Node* si
`
700
700
` }
`
701
701
`}
`
702
702
``
703
``
`-
Node* BarrierSetC2::obj_allocate(PhaseMacroExpand* macro, Node* ctrl, Node* mem, Node* toobig_false, Node* size_in_bytes,
`
``
703
`+
Node* BarrierSetC2::obj_allocate(PhaseMacroExpand* macro, Node* mem, Node* toobig_false, Node* size_in_bytes,
`
704
704
` Node*& i_o, Node*& needgc_ctrl,
`
705
705
` Node*& fast_oop_ctrl, Node*& fast_oop_rawmem,
`
706
706
` intx prefetch_lines) const {
`
`@@ -720,7 +720,7 @@ Node* BarrierSetC2::obj_allocate(PhaseMacroExpand* macro, Node* ctrl, Node* mem,
`
720
720
`// this will require extensive changes to the loop optimization in order to
`
721
721
`// prevent a degradation of the optimization.
`
722
722
`// See comment in memnode.hpp, around line 227 in class LoadPNode.
`
723
``
`-
Node *eden_end = macro->make_load(ctrl, mem, eden_end_adr, 0, TypeRawPtr::BOTTOM, T_ADDRESS);
`
``
723
`+
Node *eden_end = macro->make_load(toobig_false, mem, eden_end_adr, 0, TypeRawPtr::BOTTOM, T_ADDRESS);
`
724
724
``
725
725
`// We need a Region for the loop-back contended case.
`
726
726
`enum { fall_in_path = 1, contended_loopback_path = 2 };
`
`@@ -743,7 +743,7 @@ Node* BarrierSetC2::obj_allocate(PhaseMacroExpand* macro, Node* ctrl, Node* mem,
`
743
743
`// Load(-locked) the heap top.
`
744
744
`// See note above concerning the control input when using a TLAB
`
745
745
` Node *old_eden_top = UseTLAB
`
746
``
`-
? new LoadPNode (ctrl, contended_phi_rawmem, eden_top_adr, TypeRawPtr::BOTTOM, TypeRawPtr::BOTTOM, MemNode::unordered)
`
``
746
`+
? new LoadPNode (toobig_false, contended_phi_rawmem, eden_top_adr, TypeRawPtr::BOTTOM, TypeRawPtr::BOTTOM, MemNode::unordered)
`
747
747
` : new LoadPLockedNode(contended_region, contended_phi_rawmem, eden_top_adr, MemNode::acquire);
`
748
748
``
749
749
` macro->transform_later(old_eden_top);
`