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] Do not allow null in ephemeral value

Browse Source 
GitOrigin-RevId: cca32e434c96998346fc6759f3d699bc6ada799a
This commit is contained in:
Tagir Valeev
2020-10-08 03:09:44 +00:00
committed by intellij-monorepo-bot
parent cf5e59d8f3
commit f65c12ccbd
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/types/DfGenericObjectType.java
+5 -3
View File
@@ -249,9 +249,11 @@ class DfGenericObjectType extends DfAntiConstantType<Object> implements DfRefere
} else if (!myNotValues.containsAll(otherNotValues)) {
notValues = new THashSet<>(myNotValues);
notValues.addAll(otherNotValues);
DfEphemeralReferenceType ephemeralValue = checkEphemeral(constraint, notValues);
if (ephemeralValue != null) {
return ephemeralValue;
if (nullability == DfaNullability.NOT_NULL) {
DfEphemeralReferenceType ephemeralValue = checkEphemeral(constraint, notValues);
if (ephemeralValue != null) {
return ephemeralValue;
}
}
}
}
java/java-tests/testData/inspection/dataFlow/fixture/EphemeralInIfChain.java
+16 -2
View File
@@ -14,10 +14,24 @@ class Test {
else if (x == MyEnum.C) {
s = "C";
}
System.out.println(s.trim());
System.out.println(s.<warning descr="Method invocation 'trim' may produce 'NullPointerException'">trim</warning>()); // reachable if x is null
}
void test2(MyEnum x) {
void test1(@NotNull MyEnum x) {
String s = null;
if (x == MyEnum.A) {
s = "A";
}
else if (x == MyEnum.B) {
s = "B";
}
else if (x == MyEnum.C) {
s = "C";
}
System.out.println(s.trim()); // ephemerably reachable
}
void test2(@NotNull MyEnum x) {
String s = null;
if (x == MyEnum.A) {
s = "A";