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

JVM IR: Avoid double mangling of function reference invoke methods

Browse Source
This commit is contained in:
Steven Schäfer
2021-04-27 15:33:39 +02:00
committed by Alexander Udalov
parent 276ffd5a4b
commit 84d78035e4
16 changed files with 210 additions and 9 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
@@ -19193,6 +19193,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/javaSamReturnResult.kt");
}
@Test
@TestMetadata("mangledSamWrappers.kt")
public void testMangledSamWrappers() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/mangledSamWrappers.kt");
}
@Test
@TestMetadata("returnIC.kt")
public void testReturnIC() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBytecodeTextTestGenerated.java
Generated
+18
View File
@@ -3572,6 +3572,24 @@ public class FirBytecodeTextTestGenerated extends AbstractFirBytecodeTextTest {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/mangledInlineClassInterfaceImplementation.kt");
}
@Test
@TestMetadata("mangledSamWrappers.kt")
public void testMangledSamWrappers() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/mangledSamWrappers.kt");
}
@Test
@TestMetadata("mangledSamWrappersIndy.kt")
public void testMangledSamWrappersIndy() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/mangledSamWrappersIndy.kt");
}
@Test
@TestMetadata("mangledSamWrappersOld.kt")
public void testMangledSamWrappersOld() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/mangledSamWrappersOld.kt");
}
@Test
@TestMetadata("noActualCallsOfInlineFunctionsOfInlineClass.kt")
public void testNoActualCallsOfInlineFunctionsOfInlineClass() throws Exception {
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FunctionReferenceLowering.kt
+1 -9
View File
@@ -574,15 +574,7 @@ internal class FunctionReferenceLowering(private val context: JvmBackendContext)
private fun createInvokeMethod(receiverVar: IrValueDeclaration?): IrSimpleFunction =
functionReferenceClass.addFunction {
setSourceRange(if (isLambda) callee else irFunctionReference)
name =
if (samSuperType == null && callee.returnType.isInlineClassType() &&
context.state.functionsWithInlineClassReturnTypesMangled
) {
// For functions with inline class return type we need to mangle the invoke method.
// Otherwise, bridge lowering may fail to generate bridges for inline class types erasing to Any.
val suffix = InlineClassAbi.hashReturnSuffix(callee)
Name.identifier("${superMethod.name.asString()}-${suffix}")
} else superMethod.name
name = superMethod.name
returnType = callee.returnType
isSuspend = callee.isSuspend
}.apply {
compiler/testData/codegen/box/inlineClasses/funInterface/mangledSamWrappers.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
// IGNORE_BACKEND: JVM
// IGNORE_BACKEND: WASM
// !LANGUAGE: +InlineClasses
inline class A(val value: String)
fun interface B {
fun f(x: A): A
}
inline fun g(unit: Unit = Unit, b: B): A {
return b.f(A("Fail"))
}
fun box(): String {
val b = { _ : A -> A("O") }
return g(b = b).value + g { A("K") }.value
}
compiler/testData/codegen/bytecodeText/inlineClasses/mangledSamWrappers.kt
Vendored
+32
View File
@@ -0,0 +1,32 @@
// !LANGUAGE: +InlineClasses
inline class A(val value: String)
fun interface B {
fun f(x: A): A
}
inline fun g(unit: Unit = Unit, b: B): A {
return b.f(A("Fail"))
}
fun box(): String {
val b = { _ : A -> A("OK") }
return g(b = b).value
}
// @B.class:
// 1 public abstract f-ZsE1S_E\(Ljava/lang/String;\)Ljava/lang/String;
// @MangledSamWrappersKt.class:
// 3 INVOKEINTERFACE B.f-ZsE1S_E \(Ljava/lang/String;\)Ljava/lang/String;
// @MangledSamWrappersKt$sam$B$0.class:
// public final synthetic f-ZsE1S_E\(Ljava/lang/String;\)Ljava/lang/String;
// JVM_TEMPLATES:
// @MangledSamWrappersKt$box$b$1.class:
// 1 public final invoke\(Ljava/lang/String;\)LA;
// JVM_IR_TEMPLATES:
// @MangledSamWrappersKt$box$b$1.class:
// 0 public final invoke-ZsE1S_E-ZsE1S_E\(Ljava/lang/String;\)Ljava/lang/String;
// 1 public final invoke-ZsE1S_E\(Ljava/lang/String;\)Ljava/lang/String;
// 1 public synthetic bridge invoke\(Ljava/lang/Object;\)Ljava/lang/Object;
compiler/testData/codegen/bytecodeText/inlineClasses/mangledSamWrappersIndy.kt
Vendored
+30
View File
@@ -0,0 +1,30 @@
// IGNORE_BACKEND: JVM
// !LANGUAGE: +InlineClasses
// LAMBDAS: INDY
inline class A(val value: String?)
fun interface B {
fun f(x: A): A
}
inline fun g(unit: Unit = Unit, b: B): A {
return b.f(A("Fail"))
}
fun box(): String {
val b = { _ : A -> A("OK") }
return g(b = b).value!!
}
// 0 public final invoke-ZsE1S_E-ZsE1S_E\(Ljava/lang/String;\)Ljava/lang/String;
// 0 public final invoke-ZsE1S_E\(Ljava/lang/String;\)Ljava/lang/String;
// 0 public synthetic bridge invoke\(Ljava/lang/Object;\)Ljava/lang/Object;
// @B.class:
// 1 public abstract f-ZsE1S_E\(Ljava/lang/String;\)Ljava/lang/String;
// @MangledSamWrappersKt.class:
// 3 INVOKEINTERFACE B.f-ZsE1S_E \(Ljava/lang/String;\)Ljava/lang/String;
// 1 private final static box\$lambda-0\(LA;\)LA;
// @MangledSamWrappersKt$sam$B$0.class:
// public final synthetic f-ZsE1S_E\(Ljava/lang/String;\)Ljava/lang/String;
compiler/testData/codegen/bytecodeText/inlineClasses/mangledSamWrappersOld.kt
Vendored
+33
View File
@@ -0,0 +1,33 @@
// !LANGUAGE: +InlineClasses
// USE_OLD_INLINE_CLASSES_MANGLING_SCHEME
inline class A(val value: String)
fun interface B {
fun f(x: A): A
}
inline fun g(unit: Unit = Unit, b: B): A {
return b.f(A("Fail"))
}
fun box(): String {
val b = { _ : A -> A("OK") }
return g(b = b).value
}
// @B.class:
// 1 public abstract f-iUtXLc0\(Ljava/lang/String;\)Ljava/lang/String;
// @MangledSamWrappersKt.class:
// 3 INVOKEINTERFACE B.f-iUtXLc0 \(Ljava/lang/String;\)Ljava/lang/String;
// @MangledSamWrappersKt$sam$B$0.class:
// public final synthetic f-iUtXLc0\(Ljava/lang/String;\)Ljava/lang/String;
// JVM_TEMPLATES:
// @MangledSamWrappersKt$box$b$1.class:
// 1 public final invoke\(Ljava/lang/String;\)LA;
// JVM_IR_TEMPLATES:
// @MangledSamWrappersKt$box$b$1.class:
// 0 public final invoke-iUtXLc0-iUtXLc0\(Ljava/lang/String;\)Ljava/lang/String;
// 1 public final invoke-iUtXLc0\(Ljava/lang/String;\)Ljava/lang/String;
// 1 public synthetic bridge invoke\(Ljava/lang/Object;\)Ljava/lang/Object;
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -19169,6 +19169,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/javaSamReturnResult.kt");
}
@Test
@TestMetadata("mangledSamWrappers.kt")
public void testMangledSamWrappers() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/mangledSamWrappers.kt");
}
@Test
@TestMetadata("returnIC.kt")
public void testReturnIC() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java
Generated
+18
View File
@@ -3440,6 +3440,24 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/mangledInlineClassInterfaceImplementation.kt");
}
@Test
@TestMetadata("mangledSamWrappers.kt")
public void testMangledSamWrappers() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/mangledSamWrappers.kt");
}
@Test
@TestMetadata("mangledSamWrappersIndy.kt")
public void testMangledSamWrappersIndy() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/mangledSamWrappersIndy.kt");
}
@Test
@TestMetadata("mangledSamWrappersOld.kt")
public void testMangledSamWrappersOld() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/mangledSamWrappersOld.kt");
}
@Test
@TestMetadata("noActualCallsOfInlineFunctionsOfInlineClass.kt")
public void testNoActualCallsOfInlineFunctionsOfInlineClass() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -19193,6 +19193,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/javaSamReturnResult.kt");
}
@Test
@TestMetadata("mangledSamWrappers.kt")
public void testMangledSamWrappers() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/mangledSamWrappers.kt");
}
@Test
@TestMetadata("returnIC.kt")
public void testReturnIC() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java
Generated
+18
View File
@@ -3572,6 +3572,24 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/mangledInlineClassInterfaceImplementation.kt");
}
@Test
@TestMetadata("mangledSamWrappers.kt")
public void testMangledSamWrappers() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/mangledSamWrappers.kt");
}
@Test
@TestMetadata("mangledSamWrappersIndy.kt")
public void testMangledSamWrappersIndy() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/mangledSamWrappersIndy.kt");
}
@Test
@TestMetadata("mangledSamWrappersOld.kt")
public void testMangledSamWrappersOld() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/inlineClasses/mangledSamWrappersOld.kt");
}
@Test
@TestMetadata("noActualCallsOfInlineFunctionsOfInlineClass.kt")
public void testNoActualCallsOfInlineFunctionsOfInlineClass() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -15899,6 +15899,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/argumentResult.kt");
}
@TestMetadata("mangledSamWrappers.kt")
public void ignoreMangledSamWrappers() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/mangledSamWrappers.kt");
}
@TestMetadata("returnIC.kt")
public void ignoreReturnIC() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/returnIC.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
Generated
+5
View File
@@ -14056,6 +14056,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/argumentResult.kt");
}
@TestMetadata("mangledSamWrappers.kt")
public void testMangledSamWrappers() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/mangledSamWrappers.kt");
}
@TestMetadata("returnIC.kt")
public void testReturnIC() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/returnIC.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -13467,6 +13467,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/argumentResult.kt");
}
@TestMetadata("mangledSamWrappers.kt")
public void testMangledSamWrappers() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/mangledSamWrappers.kt");
}
@TestMetadata("returnIC.kt")
public void testReturnIC() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/returnIC.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -13532,6 +13532,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/argumentResult.kt");
}
@TestMetadata("mangledSamWrappers.kt")
public void testMangledSamWrappers() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/mangledSamWrappers.kt");
}
@TestMetadata("returnIC.kt")
public void testReturnIC() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/returnIC.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -7542,6 +7542,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/argumentResult.kt");
}
@TestMetadata("mangledSamWrappers.kt")
public void testMangledSamWrappers() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/mangledSamWrappers.kt");
}
@TestMetadata("returnIC.kt")
public void testReturnIC() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/funInterface/returnIC.kt");