Use Intrinsics.checkNotNullExpressionValue to throw NPE in Java null checks

Similarly to previous commit, this method was unused since its
introduction before 1.0, so we're changing its semantics to throw NPE
and starting to use it with API version >= 1.4.

 #KT-22275 In Progress
This commit is contained in:
Alexander Udalov
2019-08-06 09:50:21 +02:00
parent a7c8fdcbe2
commit 480313210a
16 changed files with 93 additions and 13 deletions
@@ -16414,6 +16414,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/nullCheckOptimization/isNullable.kt");
}
@TestMetadata("javaNullCheckThrowsNpe_1_4.kt")
public void testJavaNullCheckThrowsNpe_1_4() throws Exception {
runTest("compiler/testData/codegen/box/nullCheckOptimization/javaNullCheckThrowsNpe_1_4.kt");
}
@TestMetadata("kt22410.kt")
public void testKt22410() throws Exception {
runTest("compiler/testData/codegen/box/nullCheckOptimization/kt22410.kt");
@@ -3276,6 +3276,11 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
runTest("compiler/testData/codegen/bytecodeText/nullCheckOptimization/notNullAsNotNullable.kt");
}
@TestMetadata("notNullExpressionValueTwice_1_4.kt")
public void testNotNullExpressionValueTwice_1_4() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/nullCheckOptimization/notNullExpressionValueTwice_1_4.kt");
}
@TestMetadata("nullCheckAfterExclExcl_1_4.kt")
public void testNullCheckAfterExclExcl_1_4() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/nullCheckOptimization/nullCheckAfterExclExcl_1_4.kt");
@@ -16414,6 +16414,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/nullCheckOptimization/isNullable.kt");
}
@TestMetadata("javaNullCheckThrowsNpe_1_4.kt")
public void testJavaNullCheckThrowsNpe_1_4() throws Exception {
runTest("compiler/testData/codegen/box/nullCheckOptimization/javaNullCheckThrowsNpe_1_4.kt");
}
@TestMetadata("kt22410.kt")
public void testKt22410() throws Exception {
runTest("compiler/testData/codegen/box/nullCheckOptimization/kt22410.kt");
@@ -15299,6 +15299,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/nullCheckOptimization/isNullable.kt");
}
@TestMetadata("javaNullCheckThrowsNpe_1_4.kt")
public void testJavaNullCheckThrowsNpe_1_4() throws Exception {
runTest("compiler/testData/codegen/box/nullCheckOptimization/javaNullCheckThrowsNpe_1_4.kt");
}
@TestMetadata("kt22410.kt")
public void testKt22410() throws Exception {
runTest("compiler/testData/codegen/box/nullCheckOptimization/kt22410.kt");
@@ -3246,6 +3246,11 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest {
runTest("compiler/testData/codegen/bytecodeText/nullCheckOptimization/notNullAsNotNullable.kt");
}
@TestMetadata("notNullExpressionValueTwice_1_4.kt")
public void testNotNullExpressionValueTwice_1_4() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/nullCheckOptimization/notNullExpressionValueTwice_1_4.kt");
}
@TestMetadata("nullCheckAfterExclExcl_1_4.kt")
public void testNullCheckAfterExclExcl_1_4() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/nullCheckOptimization/nullCheckAfterExclExcl_1_4.kt");