MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-03 15:50:52 +07:00
Code Issues Packages Projects Releases Wiki Activity

ControlFlowAnalyzer: support polyadic division

Browse Source 
GitOrigin-RevId: 80cda272dbfb96b58313575b787fa1b06636b60e
This commit is contained in:
Tagir Valeev
2019-11-28 11:29:16 +07:00
committed by intellij-monorepo-bot
parent 9fae6c627e
commit cd2d220091
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1337,12 +1337,8 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
else if (op == JavaTokenType.OROR) {
generateShortCircuitAndOr(expression, operands, type, false);
}
else if (isBinaryDivision(op) && operands.length == 2 &&
type != null && PsiType.LONG.isAssignableFrom(type)) {
generateDivMod(expression, type, operands[0], operands[1]);
}
else {
generateOther(expression, op, operands, type);
generateBinOp(expression, op, operands, type);
}
finishElement(expression);
}
@@ -1355,18 +1351,6 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
return op == JavaTokenType.PERCEQ || op == JavaTokenType.DIVEQ;
}
private void generateDivMod(PsiPolyadicExpression expression, PsiType type, PsiExpression left, PsiExpression right) {
left.accept(this);
generateBoxingUnboxingInstructionFor(left, type);
right.accept(this);
generateBoxingUnboxingInstructionFor(right, type);
Object divisorValue = ExpressionUtils.computeConstantExpression(right);
if (!(divisorValue instanceof Number) || (((Number)divisorValue).longValue() == 0)) {
checkZeroDivisor();
}
addInstruction(new BinopInstruction(expression.getOperationTokenType(), expression.isPhysical() ? expression : null, type));
}
private void checkZeroDivisor() {
addInstruction(new DupInstruction());
addInstruction(new PushInstruction(myFactory.getConstFactory().createFromValue(0, PsiType.LONG), null));
@@ -1377,7 +1361,7 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
ifNonZero.setOffset(myCurrentFlow.getInstructionCount());
}
private void generateOther(PsiPolyadicExpression expression, IElementType op, PsiExpression[] operands, PsiType type) {
private void generateBinOp(PsiPolyadicExpression expression, IElementType op, PsiExpression[] operands, PsiType type) {
PsiExpression lExpr = operands[0];
lExpr.accept(this);
PsiType lType = lExpr.getType();
@@ -1387,6 +1371,12 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
PsiType rType = rExpr.getType();
acceptBinaryRightOperand(op, type, lExpr, lType, rExpr, rType);
if (isBinaryDivision(op) && rType != null && PsiType.LONG.isAssignableFrom(rType)) {
Object divisorValue = ExpressionUtils.computeConstantExpression(rExpr);
if (!(divisorValue instanceof Number) || (((Number)divisorValue).longValue() == 0)) {
checkZeroDivisor();
}
}
addInstruction(new BinopInstruction(op, expression, type, i));
lExpr = rExpr;