azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIR: Fix safe call receiver nullability after null check

Browse Source
This commit is contained in:
Denis.Zharkov
2021-10-22 19:59:09 +03:00
parent 2a8eacd4ba
commit 4b1ce6c1a7
7 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
Generated
+6
View File
@@ -17269,6 +17269,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
runTest("compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound3.kt");
}
@Test
@TestMetadata("safeCallDefinitelyNotNull.kt")
public void testSafeCallDefinitelyNotNull() throws Exception {
runTest("compiler/testData/diagnostics/tests/j+k/safeCallDefinitelyNotNull.kt");
}
@Test
@TestMetadata("samInConstructorWithGenerics.kt")
public void testSamInConstructorWithGenerics() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -17269,6 +17269,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
runTest("compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound3.kt");
}
@Test
@TestMetadata("safeCallDefinitelyNotNull.kt")
public void testSafeCallDefinitelyNotNull() throws Exception {
runTest("compiler/testData/diagnostics/tests/j+k/safeCallDefinitelyNotNull.kt");
}
@Test
@TestMetadata("samInConstructorWithGenerics.kt")
public void testSamInConstructorWithGenerics() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
Generated
+6
View File
@@ -17269,6 +17269,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
runTest("compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound3.kt");
}
@Test
@TestMetadata("safeCallDefinitelyNotNull.kt")
public void testSafeCallDefinitelyNotNull() throws Exception {
runTest("compiler/testData/diagnostics/tests/j+k/safeCallDefinitelyNotNull.kt");
}
@Test
@TestMetadata("samInConstructorWithGenerics.kt")
public void testSamInConstructorWithGenerics() throws Exception {
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt
+1 -1
View File
@@ -890,7 +890,7 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
safeCall.receiver.let { receiver ->
val type = receiver.coneType.takeIf { it.isMarkedNullable }
?.withNullability(ConeNullability.NOT_NULL, components.session.typeContext)
?.makeConeTypeDefinitelyNotNullOrNotNull(components.session.typeContext)
?: return@let
val variable = variableStorage.getOrCreateVariable(flow, receiver)
compiler/testData/diagnostics/tests/j+k/safeCallDefinitelyNotNull.fir.kt
Vendored
+11
View File
@@ -0,0 +1,11 @@
// SKIP_TXT
// FILE: Api.java
import org.jetbrains.annotations.NotNull;
public abstract class Api<T> {
public abstract void typeOf(@NotNull T node);
}
// FILE: main.kt
fun <E> foo(a: Api<E>, e: E?) {
e?.let { a.typeOf(e) }
}
compiler/testData/diagnostics/tests/j+k/safeCallDefinitelyNotNull.kt
Vendored
+11
View File
@@ -0,0 +1,11 @@
// SKIP_TXT
// FILE: Api.java
import org.jetbrains.annotations.NotNull;
public abstract class Api<T> {
public abstract void typeOf(@NotNull T node);
}
// FILE: main.kt
fun <E> foo(a: Api<E>, e: E?) {
e?.let { a.typeOf(<!DEBUG_INFO_SMARTCAST!>e<!>) }
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -17275,6 +17275,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound3.kt");
}
@Test
@TestMetadata("safeCallDefinitelyNotNull.kt")
public void testSafeCallDefinitelyNotNull() throws Exception {
runTest("compiler/testData/diagnostics/tests/j+k/safeCallDefinitelyNotNull.kt");
}
@Test
@TestMetadata("samInConstructorWithGenerics.kt")
public void testSamInConstructorWithGenerics() throws Exception {