From 744d868589902cc82c83873246433dd06c48ba72 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Fri, 9 Apr 2021 09:22:27 +0700 Subject: [PATCH] [java-dfa] Avoid linking traps in ReturnInstruction (EA-264470) GitOrigin-RevId: d6a1d189f9ed8f0fb0a8a6f5f87e8a432def60e6 --- .../dataFlow/lang/ir/inst/ReturnInstruction.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/inst/ReturnInstruction.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/inst/ReturnInstruction.java index 568cec387c7e..cb0f949261ac 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/inst/ReturnInstruction.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/inst/ReturnInstruction.java @@ -27,14 +27,18 @@ public class ReturnInstruction extends ControlTransferInstruction { private final PsiElement myAnchor; public ReturnInstruction(@NotNull DfaControlTransferValue transfer, @Nullable PsiElement anchor) { - super(transfer); + this(transfer, anchor, true); + } + + private ReturnInstruction(@NotNull DfaControlTransferValue transfer, @Nullable PsiElement anchor, boolean linkTraps) { + super(transfer, linkTraps); myAnchor = anchor; } @NotNull @Override public Instruction bindToFactory(@NotNull DfaValueFactory factory) { - var instruction = new ReturnInstruction(getTransfer().bindToFactory(factory), myAnchor); + var instruction = new ReturnInstruction(getTransfer().bindToFactory(factory), myAnchor, false); instruction.setIndex(getIndex()); return instruction; }