From 73d2ae961ca2ad6d527a4e03602570f1965a3cf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven=20Sch=C3=A4fer?= Date: Tue, 30 Jul 2019 10:47:53 +0200 Subject: [PATCH] JVM IR: BridgeLowering boxing fixes --- .../src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt | 1 + .../testData/codegen/bytecodeText/directInvoke/inplaceClosure.kt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt index 55f76684ad1..0d8c9211b53 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt @@ -189,6 +189,7 @@ private class BridgeLowering(val context: JvmBackendContext) : ClassLoweringPass val bridge = createBridgeHeader(irClass, target, method, isSpecial = isSpecial, isSynthetic = !isSpecial) bridge.createBridgeBody(target, defaultValueGenerator, isSpecial) irClass.declarations.add(bridge) + target.overriddenSymbols.remove(method.symbol) signaturesToSkip.add(signature) } diff --git a/compiler/testData/codegen/bytecodeText/directInvoke/inplaceClosure.kt b/compiler/testData/codegen/bytecodeText/directInvoke/inplaceClosure.kt index 3cbc1c163fc..86033d05e9d 100644 --- a/compiler/testData/codegen/bytecodeText/directInvoke/inplaceClosure.kt +++ b/compiler/testData/codegen/bytecodeText/directInvoke/inplaceClosure.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR fun test() { 1.(fun Int.() = 2)() }