From c2bdedfbaef144495c1936d2a893cfd35021f178 Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Mon, 14 Sep 2020 12:21:21 +0300 Subject: [PATCH] JVM_IR: remove descriptor usage from JvmSignatureClashDetector --- .../kotlin/backend/jvm/codegen/JvmSignatureClashDetector.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmSignatureClashDetector.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmSignatureClashDetector.kt index fc9e65ce61e..a4373fbed86 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmSignatureClashDetector.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmSignatureClashDetector.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin import org.jetbrains.kotlin.diagnostics.DiagnosticFactory1 import org.jetbrains.kotlin.ir.declarations.* +import org.jetbrains.kotlin.ir.descriptors.toIrBasedDescriptor import org.jetbrains.kotlin.ir.util.isFakeOverride import org.jetbrains.kotlin.resolve.jvm.diagnostics.* import org.jetbrains.kotlin.utils.SmartSet @@ -168,7 +169,7 @@ class JvmSignatureClashDetector( return JvmDeclarationOrigin( JvmDeclarationOriginKind.OTHER, context.psiSourceManager.findPsiElement(this), - descriptor + toIrBasedDescriptor() ) }