Skip to content

Commit f96592e

Browse files
committed
Add missing NodeSourcePosition.
1 parent f8aa982 commit f96592e

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/UseTrappingOperationPhase.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import java.util.List;
2828
import java.util.Optional;
2929

30+
import jdk.graal.compiler.debug.DebugCloseable;
3031
import jdk.graal.compiler.debug.DebugContext;
3132
import jdk.graal.compiler.graph.Node;
3233
import jdk.graal.compiler.nodeinfo.InputType;
@@ -49,7 +50,6 @@
4950
import jdk.graal.compiler.nodes.util.GraphUtil;
5051
import jdk.graal.compiler.phases.BasePhase;
5152
import jdk.graal.compiler.phases.tiers.LowTierContext;
52-
5353
import jdk.vm.ci.meta.DeoptimizationReason;
5454
import jdk.vm.ci.meta.JavaConstant;
5555
import jdk.vm.ci.meta.MetaAccessProvider;
@@ -202,6 +202,7 @@ protected void checkPredecessor(AbstractDeoptimizeNode deopt, Node predecessor,
202202
}
203203
}
204204

205+
@SuppressWarnings("try")
205206
protected void replaceWithTrappingVersion(AbstractDeoptimizeNode deopt, IfNode ifNode, LogicNode condition, JavaConstant deoptReasonAndAction, JavaConstant deoptSpeculation,
206207
LowTierContext context) {
207208
StructuredGraph graph = deopt.graph();
@@ -210,8 +211,10 @@ protected void replaceWithTrappingVersion(AbstractDeoptimizeNode deopt, IfNode i
210211
DeoptimizingFixedWithNextNode trappingVersionNode = null;
211212
trappingVersionNode = tryReplaceExisting(graph, nonTrappingContinuation, trappingContinuation, condition, ifNode, deopt, deoptReasonAndAction, deoptSpeculation, context);
212213
if (trappingVersionNode == null) {
213-
// Need to add a null check node.
214-
trappingVersionNode = createImplicitNode(graph, condition, deoptReasonAndAction, deoptSpeculation);
214+
try (DebugCloseable closable = ifNode.withNodeSourcePosition()) {
215+
// Need to add a null check node.
216+
trappingVersionNode = createImplicitNode(graph, condition, deoptReasonAndAction, deoptSpeculation);
217+
}
215218
graph.replaceSplit(ifNode, trappingVersionNode, nonTrappingContinuation);
216219
graph.getOptimizationLog().report(getClass(), "NullCheckInsertion", ifNode);
217220
}

0 commit comments

Comments
 (0)