From 5a55d56320b10e86167cccf3bd69a4a4987a965c Mon Sep 17 00:00:00 2001 From: "Denis.Zharkov" Date: Tue, 2 Feb 2021 13:08:06 +0300 Subject: [PATCH] IR: Fix offsets for value parameters for bridges Previously, offsets from super class parameter have been used and they might belong to a different file and those offsets are irrelevant to the current file --- .../org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt | 4 +++- 1 file changed, 3 insertions(+), 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 78e97767e86..063805baf08 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 @@ -558,7 +558,9 @@ internal class BridgeLowering(val context: JvmBackendContext) : FileLoweringPass target, IrDeclarationOrigin.BRIDGE, type = (substitutedType?.eraseToScope(visibleTypeParameters) ?: type.eraseTypeParameters()), // Currently there are no special bridge methods with vararg parameters, so we don't track substituted vararg element types. - varargElementType = varargElementType?.eraseToScope(visibleTypeParameters) + varargElementType = varargElementType?.eraseToScope(visibleTypeParameters), + startOffset = target.startOffset, + endOffset = target.endOffset, ) private fun IrBuilderWithScope.delegatingCall(