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

KT-52743 IR: Fix null checks in Elvis operators

Browse Source
This commit is contained in:
Pavel Mikhailovskii
2022-06-20 18:51:46 +02:00
committed by teamcity
parent ed97e73129
commit 3766698081
11 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -44747,6 +44747,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/safeCall/kt52580.kt");
}
@Test
@TestMetadata("kt52743.kt")
public void testKt52743() throws Exception {
runTest("compiler/testData/codegen/box/safeCall/kt52743.kt");
}
@Test
@TestMetadata("primitive.kt")
public void testPrimitive() throws Exception {
compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/JvmSafeCallChainFoldingLowering.kt
+2 -2
View File
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.ir.expressions.impl.*
import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.util.dump
import org.jetbrains.kotlin.ir.util.hasAnnotation
import org.jetbrains.kotlin.ir.util.isTrivial
import org.jetbrains.kotlin.ir.util.isConstantLike
import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
import org.jetbrains.kotlin.load.java.JvmAnnotationNames
@@ -121,7 +121,7 @@ class JvmSafeCallChainFoldingLowering(val context: JvmBackendContext) : FileLowe
IrConstImpl.boolean(startOffset, endOffset, context.irBuiltIns.booleanType, false)
private fun irValNotNull(startOffset: Int, endOffset: Int, irVariable: IrVariable): IrExpression =
if (irVariable.type.isJvmNullable() || irVariable.initializer?.isTrivial() != true)
if (irVariable.type.isJvmNullable() || irVariable.initializer?.isConstantLike != true)
IrGetValueImpl(startOffset, endOffset, irVariable.symbol).irEqEqNull().irNot()
else
irTrue(startOffset, endOffset)
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt
+4
View File
@@ -596,6 +596,10 @@ fun IrExpression.isTrivial() =
this is IrGetObjectValue ||
this is IrErrorExpressionImpl
val IrExpression.isConstantLike: Boolean
get() = this is IrConst<*> || this is IrGetSingletonValue
|| this is IrGetValue && this.symbol.owner.origin == IrDeclarationOrigin.INSTANCE_RECEIVER
fun IrExpression.shallowCopy(): IrExpression =
shallowCopyOrNull()
?: error("Not a copyable expression: ${render()}")
compiler/testData/codegen/box/safeCall/kt52743.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
fun <T: Any?> nullableFun(): T {
return null as T
}
fun box(): String {
val t = nullableFun<String>()
return if (t?.length == null) "OK" else "Fail"
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -44177,6 +44177,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/safeCall/kt52580.kt");
}
@Test
@TestMetadata("kt52743.kt")
public void testKt52743() throws Exception {
runTest("compiler/testData/codegen/box/safeCall/kt52743.kt");
}
@Test
@TestMetadata("primitive.kt")
public void testPrimitive() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -44747,6 +44747,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/safeCall/kt52580.kt");
}
@Test
@TestMetadata("kt52743.kt")
public void testKt52743() throws Exception {
runTest("compiler/testData/codegen/box/safeCall/kt52743.kt");
}
@Test
@TestMetadata("primitive.kt")
public void testPrimitive() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -35687,6 +35687,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/safeCall/kt52580.kt");
}
@TestMetadata("kt52743.kt")
public void testKt52743() throws Exception {
runTest("compiler/testData/codegen/box/safeCall/kt52743.kt");
}
@TestMetadata("primitive.kt")
public void testPrimitive() throws Exception {
runTest("compiler/testData/codegen/box/safeCall/primitive.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -32491,6 +32491,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/safeCall/kt52580.kt");
}
@Test
@TestMetadata("kt52743.kt")
public void testKt52743() throws Exception {
runTest("compiler/testData/codegen/box/safeCall/kt52743.kt");
}
@Test
@TestMetadata("primitive.kt")
public void testPrimitive() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -32593,6 +32593,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/safeCall/kt52580.kt");
}
@Test
@TestMetadata("kt52743.kt")
public void testKt52743() throws Exception {
runTest("compiler/testData/codegen/box/safeCall/kt52743.kt");
}
@Test
@TestMetadata("primitive.kt")
public void testPrimitive() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -29161,6 +29161,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/safeCall/kt52580.kt");
}
@TestMetadata("kt52743.kt")
public void testKt52743() throws Exception {
runTest("compiler/testData/codegen/box/safeCall/kt52743.kt");
}
@TestMetadata("primitive.kt")
public void testPrimitive() throws Exception {
runTest("compiler/testData/codegen/box/safeCall/primitive.kt");
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -35586,6 +35586,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/safeCall/kt52580.kt");
}
@Test
@TestMetadata("kt52743.kt")
public void testKt52743() throws Exception {
runTest("compiler/testData/codegen/box/safeCall/kt52743.kt");
}
@Test
@TestMetadata("primitive.kt")
public void testPrimitive() throws Exception {