MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-dfa] AssignInstruction: simplify dropLocality preconditions after introducing the aliases update

Browse Source 
GitOrigin-RevId: 470565a2be02c1694e1cee2d6f2793ca311deeba
This commit is contained in:
Tagir Valeev
2022-11-14 19:29:18 +00:00
committed by intellij-monorepo-bot
parent 1137e3ab2a
commit 5b43f98bde
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/AssignInstruction.java
+5 -11
View File
@@ -7,7 +7,6 @@ import com.intellij.codeInspection.dataFlow.interpreter.DataFlowInterpreter;
import com.intellij.codeInspection.dataFlow.java.JavaDfaHelpers;
import com.intellij.codeInspection.dataFlow.java.anchor.JavaExpressionAnchor;
import com.intellij.codeInspection.dataFlow.lang.DfaAnchor;
import com.intellij.codeInspection.dataFlow.lang.ir.ControlFlow;
import com.intellij.codeInspection.dataFlow.lang.ir.DfaInstructionState;
import com.intellij.codeInspection.dataFlow.lang.ir.ExpressionPushingInstruction;
import com.intellij.codeInspection.dataFlow.lang.ir.Instruction;
@@ -19,6 +18,7 @@ import com.intellij.codeInspection.dataFlow.value.DfaValue;
import com.intellij.codeInspection.dataFlow.value.DfaValueFactory;
import com.intellij.codeInspection.dataFlow.value.DfaVariableValue;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
@@ -77,27 +77,21 @@ public class AssignInstruction extends ExpressionPushingInstruction {
stateBefore.push(dfaDest);
return nextStates(interpreter, stateBefore);
}
if (!(dfaDest instanceof DfaVariableValue &&
((DfaVariableValue)dfaDest).getPsiVariable() instanceof PsiLocalVariable &&
dfaSource instanceof DfaVariableValue &&
(ControlFlow.isTempVariable((DfaVariableValue)dfaSource) ||
((DfaVariableValue)dfaSource).getDescriptor().isCall()))) {
if (!(dfaDest instanceof DfaVariableValue destVar && PsiUtil.isJvmLocalVariable(destVar.getPsiVariable()))) {
JavaDfaHelpers.dropLocality(dfaSource, stateBefore);
}
if (dfaDest instanceof DfaVariableValue) {
DfaVariableValue var = (DfaVariableValue) dfaDest;
if (dfaDest instanceof DfaVariableValue var) {
PsiElement psi = var.getPsiVariable();
if (dfaSource instanceof DfaTypeValue &&
((psi instanceof PsiField && ((PsiField)psi).hasModifierProperty(PsiModifier.STATIC)) ||
((psi instanceof PsiField field && field.hasModifierProperty(PsiModifier.STATIC)) ||
(var.getQualifier() != null && !stateBefore.getDfType(var.getQualifier()).isLocal()))) {
DfType dfType = dfaSource.getDfType();
if (dfType instanceof DfReferenceType) {
dfaSource = dfaSource.getFactory().fromDfType(((DfReferenceType)dfType).dropLocality());
}
}
if (!(psi instanceof PsiField) || !((PsiField)psi).hasModifierProperty(PsiModifier.VOLATILE)) {
if (!(psi instanceof PsiField field && field.hasModifierProperty(PsiModifier.VOLATILE))) {
stateBefore.setVarValue(var, dfaSource);
}
if (DfaNullability.fromDfType(var.getInherentType()) == DfaNullability.NULLABLE &&