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

Mangle bridges if its return type is not inline

Browse Source 
#KT-51235 Fixed
This commit is contained in:
Ilmir Usmanov
2022-02-11 05:34:50 +01:00
parent 7ad69ea8eb
commit 8f23fc54a4
11 changed files with 161 additions and 6 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
@@ -20491,6 +20491,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/inlineClasses/nullableWrapperEquality.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
}
@Test
@TestMetadata("overrideReturnNothing.kt")
public void testOverrideReturnNothing() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt");
}
@Test
@TestMetadata("overridingFunCallingPrivateFun.kt")
public void testOverridingFunCallingPrivateFun() throws Exception {
compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt
+18 -6
View File
@@ -15,9 +15,7 @@ import org.jetbrains.kotlin.backend.common.lower.VariableRemapper
import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
import org.jetbrains.kotlin.backend.common.lower.irNot
import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase
import org.jetbrains.kotlin.backend.jvm.JvmBackendContext
import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
import org.jetbrains.kotlin.backend.jvm.SpecialBridge
import org.jetbrains.kotlin.backend.jvm.*
import org.jetbrains.kotlin.backend.jvm.ir.*
import org.jetbrains.kotlin.codegen.AsmUtil
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
@@ -345,10 +343,14 @@ internal class BridgeLowering(val context: JvmBackendContext) : FileLoweringPass
for (override in irFunction.allOverridden()) {
if (override.isFakeOverride) continue
val signature = override.jvmMethod
val target = override.mangleFunctionIfNeeded()
val signature = target.jvmMethod
if (targetMethod != signature && signature !in blacklist) {
val bridge = generated.getOrPut(signature) { Bridge(override, signature) }
bridge.overriddenSymbols += override.symbol
val bridge = generated.getOrPut(signature) {
Bridge(target, signature)
}
bridge.overriddenSymbols += target.symbol
}
}
@@ -360,6 +362,16 @@ internal class BridgeLowering(val context: JvmBackendContext) : FileLoweringPass
.forEach { irClass.addBridge(it, bridgeTarget) }
}
private fun IrSimpleFunction.mangleFunctionIfNeeded(): IrSimpleFunction {
if (!hasMangledReturnType && !hasMangledParameters) return this
val replacement = context.inlineClassReplacements.getReplacementFunction(this) ?: return this
if (name.asString().substringAfterLast('-') == replacement.name.asString().substringAfterLast('-')) {
// function is already mangled
return this
}
return replacement
}
private fun IrSimpleFunction.isClashingWithPotentialBridge(name: Name, signature: Method): Boolean =
(!this.isFakeOverride || this.modality == Modality.FINAL) && this.name == name && this.jvmMethod == signature
compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt
Vendored
+49
View File
@@ -0,0 +1,49 @@
// WITH_STDLIB
// CHECK_BYTECODE_LISTING
// IGNORE_BACKEND: JS, JS_IR, WASM
// TODO: Fir2Ir generates overrides as finals.
// IGNORE_BACKEND_FIR: JVM_IR
@JvmInline
value class Inlined(val value: Int)
sealed interface A {
val property: Inlined?
val property2: Inlined
fun foo(): Inlined?
fun foo2(): Inlined
}
class B : A {
override val property: Nothing? = null
override val property2: Nothing
get() = error("OK")
override fun foo(): Nothing? = null
override fun foo2(): Nothing = error("OK")
}
fun box(): String {
val a: A = B()
if (a.property != null) return "FAIL 1"
if (a.foo() != null) return "FAIL 2"
try {
a.property2
return "FAIL 3"
} catch (e: IllegalStateException) {
if (e.message != "OK") return "FAIL 4: ${e.message}"
}
try {
a.foo2()
return "FAIL 5"
} catch (e: IllegalStateException) {
if (e.message != "OK") return "FAIL 6: ${e.message}"
}
return "OK"
}
compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.txt
Vendored
+48
View File
@@ -0,0 +1,48 @@
@kotlin.Metadata
public interface A {
// source: 'overrideReturnNothing.kt'
public abstract @org.jetbrains.annotations.Nullable method foo-wSRmS7I(): Inlined
public abstract method foo2-yXoPhBc(): int
public abstract @org.jetbrains.annotations.Nullable method getProperty-wSRmS7I(): Inlined
public abstract method getProperty2-yXoPhBc(): int
}
@kotlin.Metadata
public final class B {
// source: 'overrideReturnNothing.kt'
private final @org.jetbrains.annotations.Nullable field property: java.lang.Void
public method <init>(): void
public @org.jetbrains.annotations.Nullable method foo(): java.lang.Void
public synthetic bridge method foo-wSRmS7I(): Inlined
public @org.jetbrains.annotations.NotNull method foo2(): java.lang.Void
public synthetic bridge method foo2-yXoPhBc(): int
public @org.jetbrains.annotations.Nullable method getProperty(): java.lang.Void
public synthetic bridge method getProperty-wSRmS7I(): Inlined
public @org.jetbrains.annotations.NotNull method getProperty2(): java.lang.Void
public synthetic bridge method getProperty2-yXoPhBc(): int
}
@kotlin.jvm.JvmInline
@kotlin.Metadata
public final class Inlined {
// source: 'overrideReturnNothing.kt'
private final field value: int
private synthetic method <init>(p0: int): void
public synthetic final static method box-impl(p0: int): Inlined
public static method constructor-impl(p0: int): int
public method equals(p0: java.lang.Object): boolean
public static method equals-impl(p0: int, p1: java.lang.Object): boolean
public final static method equals-impl0(p0: int, p1: int): boolean
public final method getValue(): int
public method hashCode(): int
public static method hashCode-impl(p0: int): int
public method toString(): java.lang.String
public static method toString-impl(p0: int): java.lang.String
public synthetic final method unbox-impl(): int
}
@kotlin.Metadata
public final class OverrideReturnNothingKt {
// source: 'overrideReturnNothing.kt'
public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -20071,6 +20071,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/inlineClasses/nullableWrapperEquality.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
}
@Test
@TestMetadata("overrideReturnNothing.kt")
public void testOverrideReturnNothing() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt");
}
@Test
@TestMetadata("overridingFunCallingPrivateFun.kt")
public void testOverridingFunCallingPrivateFun() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -20491,6 +20491,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/inlineClasses/nullableWrapperEquality.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
}
@Test
@TestMetadata("overrideReturnNothing.kt")
public void testOverrideReturnNothing() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt");
}
@Test
@TestMetadata("overridingFunCallingPrivateFun.kt")
public void testOverridingFunCallingPrivateFun() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -16715,6 +16715,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/inlineClasses/nullableWrapperEquality.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
}
@TestMetadata("overrideReturnNothing.kt")
public void testOverrideReturnNothing() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt");
}
@TestMetadata("overridingFunCallingPrivateFun.kt")
public void testOverridingFunCallingPrivateFun() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/overridingFunCallingPrivateFun.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -15753,6 +15753,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/inlineClasses/nullableWrapperEquality.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation());
}
@Test
@TestMetadata("overrideReturnNothing.kt")
public void testOverrideReturnNothing() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt");
}
@Test
@TestMetadata("overridingFunCallingPrivateFun.kt")
public void testOverridingFunCallingPrivateFun() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -15717,6 +15717,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/inlineClasses/nullableWrapperEquality.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation());
}
@Test
@TestMetadata("overrideReturnNothing.kt")
public void testOverrideReturnNothing() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt");
}
@Test
@TestMetadata("overridingFunCallingPrivateFun.kt")
public void testOverridingFunCallingPrivateFun() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -13242,6 +13242,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/inlineClasses/nullableWrapperEquality.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation());
}
@TestMetadata("overrideReturnNothing.kt")
public void testOverrideReturnNothing() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt");
}
@TestMetadata("overridingFunCallingPrivateFun.kt")
public void testOverridingFunCallingPrivateFun() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/overridingFunCallingPrivateFun.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation());
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -17089,6 +17089,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/inlineClasses/nullableWrapperEquality.kt");
}
@Test
@TestMetadata("overrideReturnNothing.kt")
public void testOverrideReturnNothing() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/overrideReturnNothing.kt");
}
@Test
@TestMetadata("overridingFunCallingPrivateFun.kt")
public void testOverridingFunCallingPrivateFun() throws Exception {