MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

DfaAssist: support while and do-while loops

Browse Source 
GitOrigin-RevId: 2061e3ea64f9091060770c5bfa08c70f6921ad54
This commit is contained in:
Tagir Valeev
2020-01-30 13:25:22 +07:00
committed by intellij-monorepo-bot
parent 6e12ae7e93
commit eb1143abcf
4 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
View File

@@ -61,6 +61,15 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
private final Map<String, ExceptionTransfer> myExceptionCache;
private ExpressionBlockContext myExpressionBlockContext;
/**
* @param valueFactory factory to create values
* @param codeFragment code fragment to analyze:
* normally a PsiCodeBlock or PsiExpression.
* If PsiWhileStatement or PsiDoWhileStatement then only one loop iteration will be analyzed
* (similar to analyzing the loop body, but condition is analyzed as well).
* If PsiClass then class initializers + field initializers will be analyzed
* @param inlining if true inlining is performed for known method calls
*/
ControlFlowAnalyzer(final DfaValueFactory valueFactory, @NotNull PsiElement codeFragment, boolean inlining) {
myInlining = inlining;
myFactory = valueFactory;
@@ -429,7 +438,7 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
@Override public void visitContinueStatement(PsiContinueStatement statement) {
startElement(statement);
PsiStatement continuedStatement = statement.findContinuedStatement();
if (continuedStatement instanceof PsiLoopStatement && PsiTreeUtil.isAncestor(myCodeFragment, continuedStatement, false)) {
if (continuedStatement instanceof PsiLoopStatement && PsiTreeUtil.isAncestor(myCodeFragment, continuedStatement, true)) {
PsiStatement body = ((PsiLoopStatement)continuedStatement).getBody();
controlTransfer(new InstructionTransfer(getEndOffset(body), getVariablesInside(body)), getTrapsInsideElement(body));
} else {
@@ -449,7 +458,11 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
if (condition != null) {
condition.accept(this);
generateBoxingUnboxingInstructionFor(condition, PsiType.BOOLEAN);
addInstruction(new ConditionalGotoInstruction(getStartOffset(statement), false, condition));
if (statement == myCodeFragment) {
addInstruction(new PopInstruction());
} else {
addInstruction(new ConditionalGotoInstruction(getStartOffset(statement), false, condition));
}
}
}
@@ -1172,7 +1185,9 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
body.accept(this);
}
addInstruction(new GotoInstruction(getStartOffset(statement)));
if (statement != myCodeFragment) {
addInstruction(new GotoInstruction(getStartOffset(statement)));
}
finishElement(statement);
}