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

[Native] Always cast expression to the expected type after inline

Browse Source 
Right now, during the process of inlining, the compiler erases types.
Because of that, we can end up with some random type
(for example, `Any`) where the concrete type was
expected (for example, `Int`). Compiler must insert a cast in the
required places.

#KT-66017 Fixed
This commit is contained in:
Ivan Kylchik
2024-03-06 14:38:17 +01:00
committed by Space Team
parent 555cf56d6d
commit e1180adfbd
27 changed files with 438 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+18
View File
@@ -24667,12 +24667,30 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
runTest("compiler/testData/codegen/box/inline/inlineCtor.kt");
}
@Test
@TestMetadata("inlinedLambdaWithErasedParamType.kt")
public void testInlinedLambdaWithErasedParamType() {
runTest("compiler/testData/codegen/box/inline/inlinedLambdaWithErasedParamType.kt");
}
@Test
@TestMetadata("innerInlineFunCapturesOuter.kt")
public void testInnerInlineFunCapturesOuter() {
runTest("compiler/testData/codegen/box/inline/innerInlineFunCapturesOuter.kt");
}
@Test
@TestMetadata("kt66017.kt")
public void testKt66017() {
runTest("compiler/testData/codegen/box/inline/kt66017.kt");
}
@Test
@TestMetadata("kt66017_inlineFromTheSameModule.kt")
public void testKt66017_inlineFromTheSameModule() {
runTest("compiler/testData/codegen/box/inline/kt66017_inlineFromTheSameModule.kt");
}
@Test
@TestMetadata("lambdaAsAny.kt")
public void testLambdaAsAny() {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java
Generated
+18
View File
@@ -24667,12 +24667,30 @@ public class FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGener
runTest("compiler/testData/codegen/box/inline/inlineCtor.kt");
}
@Test
@TestMetadata("inlinedLambdaWithErasedParamType.kt")
public void testInlinedLambdaWithErasedParamType() {
runTest("compiler/testData/codegen/box/inline/inlinedLambdaWithErasedParamType.kt");
}
@Test
@TestMetadata("innerInlineFunCapturesOuter.kt")
public void testInnerInlineFunCapturesOuter() {
runTest("compiler/testData/codegen/box/inline/innerInlineFunCapturesOuter.kt");
}
@Test
@TestMetadata("kt66017.kt")
public void testKt66017() {
runTest("compiler/testData/codegen/box/inline/kt66017.kt");
}
@Test
@TestMetadata("kt66017_inlineFromTheSameModule.kt")
public void testKt66017_inlineFromTheSameModule() {
runTest("compiler/testData/codegen/box/inline/kt66017_inlineFromTheSameModule.kt");
}
@Test
@TestMetadata("lambdaAsAny.kt")
public void testLambdaAsAny() {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+18
View File
@@ -24667,12 +24667,30 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/inline/inlineCtor.kt");
}
@Test
@TestMetadata("inlinedLambdaWithErasedParamType.kt")
public void testInlinedLambdaWithErasedParamType() {
runTest("compiler/testData/codegen/box/inline/inlinedLambdaWithErasedParamType.kt");
}
@Test
@TestMetadata("innerInlineFunCapturesOuter.kt")
public void testInnerInlineFunCapturesOuter() {
runTest("compiler/testData/codegen/box/inline/innerInlineFunCapturesOuter.kt");
}
@Test
@TestMetadata("kt66017.kt")
public void testKt66017() {
runTest("compiler/testData/codegen/box/inline/kt66017.kt");
}
@Test
@TestMetadata("kt66017_inlineFromTheSameModule.kt")
public void testKt66017_inlineFromTheSameModule() {
runTest("compiler/testData/codegen/box/inline/kt66017_inlineFromTheSameModule.kt");
}
@Test
@TestMetadata("lambdaAsAny.kt")
public void testLambdaAsAny() {
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/TailSuspendCallsCollector.kt
+15 -2
View File
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.ir.types.isUnit
import org.jetbrains.kotlin.ir.util.isSuspend
import org.jetbrains.kotlin.ir.util.render
import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
data class TailSuspendCalls(val callSites: Set<IrCall>, val hasNotTailSuspendCalls: Boolean)
@@ -36,6 +37,14 @@ fun collectTailSuspendCalls(context: CommonBackendContext, irFunction: IrSimpleF
element.acceptChildren(this, VisitorState(data.insideTryBlock, isTailExpression = false))
}
override fun visitTypeOperator(expression: IrTypeOperatorCall, data: VisitorState) {
if (expression.operator == IrTypeOperator.IMPLICIT_CAST) {
expression.acceptChildren(this, data)
} else {
super.visitTypeOperator(expression, data)
}
}
override fun visitTry(aTry: IrTry, data: VisitorState) {
aTry.tryResult.accept(this, VisitorState(insideTryBlock = true, isTailExpression = false))
aTry.catches.forEach { it.result.accept(this, data) }
@@ -98,8 +107,12 @@ fun collectTailSuspendCalls(context: CommonBackendContext, irFunction: IrSimpleF
expression.acceptChildren(this, VisitorState(data.insideTryBlock, isTailExpression))
}
private fun IrExpression.isUnitRead(): Boolean =
this is IrGetObjectValue && symbol == context.irBuiltIns.unitClass
private fun IrExpression.isUnitRead(): Boolean {
if (this is IrTypeOperatorCall) {
return this.argument.isUnitRead()
}
return this is IrGetObjectValue && symbol == context.irBuiltIns.unitClass
}
private fun IrCall.isReturnIfSuspendedCall() =
symbol == context.ir.symbols.returnIfSuspended
compiler/testData/codegen/box/inline/inlinedLambdaWithErasedParamType.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
class A<T>(val prop: T)
inline fun <T> A<T>.process(action: (T) -> Unit) {
action(prop)
}
inline fun acceptInt(p: Int, action: (Int) -> Unit) {
action(p)
}
fun box(): String {
var x = 0
A(1).process { acceptInt(it) { p -> x += p } }
return ('N' + x).toString() + "K"
}
compiler/testData/codegen/box/inline/kt66017.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
// WITH_STDLIB
fun box(): String {
listOf(1).forEach { size ->
repeat(size) {
return "OK"
}
}
return "Fail"
}
compiler/testData/codegen/box/inline/kt66017_inlineFromTheSameModule.kt
Vendored
+20
View File
@@ -0,0 +1,20 @@
// WITH_STDLIB
inline fun <T> Iterable<T>.myForEach(action: (T) -> Unit): Unit {
for (element in this) action(element)
}
inline fun myRepeat(times: Int, action: (Int) -> Unit) {
for (index in 0 until times) {
action(index)
}
}
fun box(): String {
listOf(1).myForEach { size ->
myRepeat(size) {
return "OK"
}
}
return "Fail"
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java
Generated
+18
View File
@@ -24667,12 +24667,30 @@ public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistency
runTest("compiler/testData/codegen/box/inline/inlineCtor.kt");
}
@Test
@TestMetadata("inlinedLambdaWithErasedParamType.kt")
public void testInlinedLambdaWithErasedParamType() {
runTest("compiler/testData/codegen/box/inline/inlinedLambdaWithErasedParamType.kt");
}
@Test
@TestMetadata("innerInlineFunCapturesOuter.kt")
public void testInnerInlineFunCapturesOuter() {
runTest("compiler/testData/codegen/box/inline/innerInlineFunCapturesOuter.kt");
}
@Test
@TestMetadata("kt66017.kt")
public void testKt66017() {
runTest("compiler/testData/codegen/box/inline/kt66017.kt");
}
@Test
@TestMetadata("kt66017_inlineFromTheSameModule.kt")
public void testKt66017_inlineFromTheSameModule() {
runTest("compiler/testData/codegen/box/inline/kt66017_inlineFromTheSameModule.kt");
}
@Test
@TestMetadata("lambdaAsAny.kt")
public void testLambdaAsAny() {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+18
View File
@@ -23431,6 +23431,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/inline/inlineCtor.kt");
}
@Test
@TestMetadata("inlinedLambdaWithErasedParamType.kt")
public void testInlinedLambdaWithErasedParamType() {
runTest("compiler/testData/codegen/box/inline/inlinedLambdaWithErasedParamType.kt");
}
@Test
@TestMetadata("kt66017.kt")
public void testKt66017() {
runTest("compiler/testData/codegen/box/inline/kt66017.kt");
}
@Test
@TestMetadata("kt66017_inlineFromTheSameModule.kt")
public void testKt66017_inlineFromTheSameModule() {
runTest("compiler/testData/codegen/box/inline/kt66017_inlineFromTheSameModule.kt");
}
@Test
@TestMetadata("lambdaAsAny.kt")
public void testLambdaAsAny() {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+18
View File
@@ -24667,12 +24667,30 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/inline/inlineCtor.kt");
}
@Test
@TestMetadata("inlinedLambdaWithErasedParamType.kt")
public void testInlinedLambdaWithErasedParamType() {
runTest("compiler/testData/codegen/box/inline/inlinedLambdaWithErasedParamType.kt");
}
@Test
@TestMetadata("innerInlineFunCapturesOuter.kt")
public void testInnerInlineFunCapturesOuter() {
runTest("compiler/testData/codegen/box/inline/innerInlineFunCapturesOuter.kt");
}
@Test
@TestMetadata("kt66017.kt")
public void testKt66017() {
runTest("compiler/testData/codegen/box/inline/kt66017.kt");
}
@Test
@TestMetadata("kt66017_inlineFromTheSameModule.kt")
public void testKt66017_inlineFromTheSameModule() {
runTest("compiler/testData/codegen/box/inline/kt66017_inlineFromTheSameModule.kt");
}
@Test
@TestMetadata("lambdaAsAny.kt")
public void testLambdaAsAny() {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
Generated
+18
View File
@@ -24667,12 +24667,30 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
runTest("compiler/testData/codegen/box/inline/inlineCtor.kt");
}
@Test
@TestMetadata("inlinedLambdaWithErasedParamType.kt")
public void testInlinedLambdaWithErasedParamType() {
runTest("compiler/testData/codegen/box/inline/inlinedLambdaWithErasedParamType.kt");
}
@Test
@TestMetadata("innerInlineFunCapturesOuter.kt")
public void testInnerInlineFunCapturesOuter() {
runTest("compiler/testData/codegen/box/inline/innerInlineFunCapturesOuter.kt");
}
@Test
@TestMetadata("kt66017.kt")
public void testKt66017() {
runTest("compiler/testData/codegen/box/inline/kt66017.kt");
}
@Test
@TestMetadata("kt66017_inlineFromTheSameModule.kt")
public void testKt66017_inlineFromTheSameModule() {
runTest("compiler/testData/codegen/box/inline/kt66017_inlineFromTheSameModule.kt");
}
@Test
@TestMetadata("lambdaAsAny.kt")
public void testLambdaAsAny() {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java
Generated
+18
View File
@@ -24667,12 +24667,30 @@ public class FirBlackBoxCodegenTestWithInlineScopesGenerated extends AbstractFir
runTest("compiler/testData/codegen/box/inline/inlineCtor.kt");
}
@Test
@TestMetadata("inlinedLambdaWithErasedParamType.kt")
public void testInlinedLambdaWithErasedParamType() {
runTest("compiler/testData/codegen/box/inline/inlinedLambdaWithErasedParamType.kt");
}
@Test
@TestMetadata("innerInlineFunCapturesOuter.kt")
public void testInnerInlineFunCapturesOuter() {
runTest("compiler/testData/codegen/box/inline/innerInlineFunCapturesOuter.kt");
}
@Test
@TestMetadata("kt66017.kt")
public void testKt66017() {
runTest("compiler/testData/codegen/box/inline/kt66017.kt");
}
@Test
@TestMetadata("kt66017_inlineFromTheSameModule.kt")
public void testKt66017_inlineFromTheSameModule() {
runTest("compiler/testData/codegen/box/inline/kt66017_inlineFromTheSameModule.kt");
}
@Test
@TestMetadata("lambdaAsAny.kt")
public void testLambdaAsAny() {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+15
View File
@@ -20683,11 +20683,26 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/inline/inlineCtor.kt");
}
@TestMetadata("inlinedLambdaWithErasedParamType.kt")
public void testInlinedLambdaWithErasedParamType() {
runTest("compiler/testData/codegen/box/inline/inlinedLambdaWithErasedParamType.kt");
}
@TestMetadata("innerInlineFunCapturesOuter.kt")
public void testInnerInlineFunCapturesOuter() {
runTest("compiler/testData/codegen/box/inline/innerInlineFunCapturesOuter.kt");
}
@TestMetadata("kt66017.kt")
public void testKt66017() {
runTest("compiler/testData/codegen/box/inline/kt66017.kt");
}
@TestMetadata("kt66017_inlineFromTheSameModule.kt")
public void testKt66017_inlineFromTheSameModule() {
runTest("compiler/testData/codegen/box/inline/kt66017_inlineFromTheSameModule.kt");
}
@TestMetadata("lambdaAsAny.kt")
public void testLambdaAsAny() {
runTest("compiler/testData/codegen/box/inline/lambdaAsAny.kt");