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

Generate inline function arguments with parameters types

Browse Source 
#KT-44429 Fixed
This commit is contained in:
Mikhael Bogdanov
2021-01-20 07:01:19 +01:00
parent 50ab9ed054
commit 147d60523d
13 changed files with 68 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBlackBoxInlineCodegenTestGenerated.java
Generated
+5
View File
@@ -1099,6 +1099,11 @@ public class FirBlackBoxInlineCodegenTestGenerated extends AbstractFirBlackBoxIn
runTest("compiler/testData/codegen/boxInline/complex/forEachLine.kt");
}
@TestMetadata("kt44429.kt")
public void testKt44429() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/kt44429.kt");
}
@TestMetadata("lambdaInLambda.kt")
public void testLambdaInLambda() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/lambdaInLambda.kt");
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt
+3 -3
View File
@@ -198,13 +198,13 @@ class ExpressionCodegen(
return StackValue.onStack(type, irType.toIrBasedKotlinType())
}
internal fun genOrGetLocal(expression: IrExpression, data: BlockInfo): StackValue {
internal fun genOrGetLocal(expression: IrExpression, type: Type, parameterType: IrType, data: BlockInfo): StackValue {
if (irFunction.origin == IrDeclarationOrigin.FUNCTION_FOR_DEFAULT_PARAMETER) {
if (expression is IrTypeOperatorCall && expression.operator == IrTypeOperator.IMPLICIT_CAST) {
// inline lambda parameters are passed from `foo$default` to `foo` call with implicit cast,
// we need return pure StackValue.local value to be able proper inline this parameter later
if (expression.type.makeNullable() == expression.argument.type) {
return genOrGetLocal(expression.argument, data)
return genOrGetLocal(expression.argument, type, parameterType, data)
}
}
}
@@ -212,7 +212,7 @@ class ExpressionCodegen(
return if (expression is IrGetValue)
StackValue.local(findLocalIndex(expression.symbol), frameMap.typeOf(expression.symbol), expression.type.toIrBasedKotlinType())
else
gen(expression, typeMapper.mapType(expression.type), expression.type, data)
gen(expression, type, parameterType, data)
}
fun generate() {
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineCodegen.kt
+2 -2
View File
@@ -110,7 +110,7 @@ class IrInlineCodegen(
// Reuse an existing local if possible. NOTE: when stopping at a breakpoint placed
// in an inline function, arguments which reuse an existing local will not be visible
// in the debugger.
-> codegen.genOrGetLocal(argumentExpression, blockInfo)
-> codegen.genOrGetLocal(argumentExpression, parameterType, irValueParameter.type, blockInfo)
else
// Do not reuse locals for receivers. While it's actually completely fine, the non-IR
// backend does not do it for internal reasons, and here we replicate the debugging
@@ -128,7 +128,7 @@ class IrInlineCodegen(
}
private fun putCapturedValueOnStack(argumentExpression: IrExpression, valueType: Type, capturedParamIndex: Int) {
val onStack = codegen.genOrGetLocal(argumentExpression, BlockInfo())
val onStack = codegen.genOrGetLocal(argumentExpression, valueType, argumentExpression.type, BlockInfo())
val expectedType = JvmKotlinType(valueType, argumentExpression.type.toIrBasedKotlinType())
putArgumentOrCapturedToLocalVal(expectedType, onStack, capturedParamIndex, capturedParamIndex, ValueKind.CAPTURED)
}
compiler/testData/codegen/boxInline/complex/kt44429.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
// FILE: 1.kt
package test
inline fun <T> takeT(t: T) {}
// FILE: 2.kt
import test.*
fun box(): String {
val f = { null } as () -> Int
takeT(f())
return "OK"
}
compiler/tests-gen/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java
Generated
+5
View File
@@ -1099,6 +1099,11 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo
runTest("compiler/testData/codegen/boxInline/complex/forEachLine.kt");
}
@TestMetadata("kt44429.kt")
public void testKt44429() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/kt44429.kt");
}
@TestMetadata("lambdaInLambda.kt")
public void testLambdaInLambda() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/lambdaInLambda.kt");
compiler/tests-gen/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java
Generated
+5
View File
@@ -1099,6 +1099,11 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
runTest("compiler/testData/codegen/boxInline/complex/forEachLine.kt");
}
@TestMetadata("kt44429.kt")
public void testKt44429() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/kt44429.kt");
}
@TestMetadata("lambdaInLambda.kt")
public void testLambdaInLambda() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/lambdaInLambda.kt");
compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java
Generated
+5
View File
@@ -1099,6 +1099,11 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli
runTest("compiler/testData/codegen/boxInline/complex/forEachLine.kt");
}
@TestMetadata("kt44429.kt")
public void testKt44429() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/kt44429.kt");
}
@TestMetadata("lambdaInLambda.kt")
public void testLambdaInLambda() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/lambdaInLambda.kt");
compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java
Generated
+5
View File
@@ -1099,6 +1099,11 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC
runTest("compiler/testData/codegen/boxInline/complex/forEachLine.kt");
}
@TestMetadata("kt44429.kt")
public void testKt44429() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/kt44429.kt");
}
@TestMetadata("lambdaInLambda.kt")
public void testLambdaInLambda() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/lambdaInLambda.kt");
compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxInlineTestGenerated.java
Generated
+5
View File
@@ -1099,6 +1099,11 @@ public class JvmIrAgainstOldBoxInlineTestGenerated extends AbstractJvmIrAgainstO
runTest("compiler/testData/codegen/boxInline/complex/forEachLine.kt");
}
@TestMetadata("kt44429.kt")
public void testKt44429() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/kt44429.kt");
}
@TestMetadata("lambdaInLambda.kt")
public void testLambdaInLambda() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/lambdaInLambda.kt");
compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxInlineTestGenerated.java
Generated
+5
View File
@@ -1099,6 +1099,11 @@ public class JvmOldAgainstIrBoxInlineTestGenerated extends AbstractJvmOldAgainst
runTest("compiler/testData/codegen/boxInline/complex/forEachLine.kt");
}
@TestMetadata("kt44429.kt")
public void testKt44429() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/kt44429.kt");
}
@TestMetadata("lambdaInLambda.kt")
public void testLambdaInLambda() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/lambdaInLambda.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenInlineES6TestGenerated.java
Generated
+5
View File
@@ -949,6 +949,11 @@ public class IrJsCodegenInlineES6TestGenerated extends AbstractIrJsCodegenInline
runTest("compiler/testData/codegen/boxInline/complex/closureChain.kt");
}
@TestMetadata("kt44429.kt")
public void testKt44429() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/kt44429.kt");
}
@TestMetadata("swapAndWith.kt")
public void testSwapAndWith() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/swapAndWith.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenInlineTestGenerated.java
Generated
+5
View File
@@ -949,6 +949,11 @@ public class IrJsCodegenInlineTestGenerated extends AbstractIrJsCodegenInlineTes
runTest("compiler/testData/codegen/boxInline/complex/closureChain.kt");
}
@TestMetadata("kt44429.kt")
public void testKt44429() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/kt44429.kt");
}
@TestMetadata("swapAndWith.kt")
public void testSwapAndWith() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/swapAndWith.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenInlineTestGenerated.java
Generated
+5
View File
@@ -949,6 +949,11 @@ public class JsCodegenInlineTestGenerated extends AbstractJsCodegenInlineTest {
runTest("compiler/testData/codegen/boxInline/complex/closureChain.kt");
}
@TestMetadata("kt44429.kt")
public void testKt44429() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/kt44429.kt");
}
@TestMetadata("swapAndWith.kt")
public void testSwapAndWith() throws Exception {
runTest("compiler/testData/codegen/boxInline/complex/swapAndWith.kt");