From 03aa14b473ad1261d8ec3ded40cee3e3f5d19ed9 Mon Sep 17 00:00:00 2001 From: Sergej Jaskiewicz Date: Tue, 23 Jan 2024 17:07:18 +0100 Subject: [PATCH] [klib] Use "IR signatures" i/o "KLIB signatures" in diagnostics We already use the term "IR signatures" in other places. --- .../backend/common/diagnostics/SerializationErrors.kt | 2 +- .../klibSerializationTests/signatureClash.diag.txt | 6 +++--- .../compilerOutput/SignatureClashDiagnostics/output.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/diagnostics/SerializationErrors.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/diagnostics/SerializationErrors.kt index 26291f52fcb..c6e9f3e43cc 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/diagnostics/SerializationErrors.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/diagnostics/SerializationErrors.kt @@ -41,7 +41,7 @@ internal object KtDefaultSerializationErrorMessages : BaseDiagnosticRendererFact internal object SerializationDiagnosticRenderers { val CONFLICTING_KLIB_SIGNATURES_DATA = CommonRenderers.renderConflictingSignatureData( - signatureKind = "KLIB", + signatureKind = "IR", sortUsing = MemberComparator.INSTANCE, declarationRenderer = Renderer { DescriptorRenderer.WITHOUT_MODIFIERS.render(it) diff --git a/compiler/testData/diagnostics/klibSerializationTests/signatureClash.diag.txt b/compiler/testData/diagnostics/klibSerializationTests/signatureClash.diag.txt index 3cd11200b93..fc99ca58a4f 100644 --- a/compiler/testData/diagnostics/klibSerializationTests/signatureClash.diag.txt +++ b/compiler/testData/diagnostics/klibSerializationTests/signatureClash.diag.txt @@ -1,14 +1,14 @@ -/foo.kt:13:1: error: Platform declaration clash: The following declarations have the same KLIB signature (com.example.klib.serialization.diagnostics/foo|foo(){}[0]): +/foo.kt:13:1: error: Platform declaration clash: The following declarations have the same IR signature (com.example.klib.serialization.diagnostics/foo|foo(){}[0]): fun foo(): kotlin.Long defined in com.example.klib.serialization.diagnostics fun foo(): kotlin.String defined in com.example.klib.serialization.diagnostics fun foo(): kotlin.Int defined in com.example.klib.serialization.diagnostics -/main.kt:19:1: error: Platform declaration clash: The following declarations have the same KLIB signature (com.example.klib.serialization.diagnostics/foo|foo(){}[0]): +/main.kt:19:1: error: Platform declaration clash: The following declarations have the same IR signature (com.example.klib.serialization.diagnostics/foo|foo(){}[0]): fun foo(): kotlin.Long defined in com.example.klib.serialization.diagnostics fun foo(): kotlin.String defined in com.example.klib.serialization.diagnostics fun foo(): kotlin.Int defined in com.example.klib.serialization.diagnostics -/main.kt:22:1: error: Platform declaration clash: The following declarations have the same KLIB signature (com.example.klib.serialization.diagnostics/foo|foo(){}[0]): +/main.kt:22:1: error: Platform declaration clash: The following declarations have the same IR signature (com.example.klib.serialization.diagnostics/foo|foo(){}[0]): fun foo(): kotlin.Long defined in com.example.klib.serialization.diagnostics fun foo(): kotlin.String defined in com.example.klib.serialization.diagnostics fun foo(): kotlin.Int defined in com.example.klib.serialization.diagnostics diff --git a/native/native.tests/testData/compilerOutput/SignatureClashDiagnostics/output.txt b/native/native.tests/testData/compilerOutput/SignatureClashDiagnostics/output.txt index bead3034b14..35de65c7ef3 100644 --- a/native/native.tests/testData/compilerOutput/SignatureClashDiagnostics/output.txt +++ b/native/native.tests/testData/compilerOutput/SignatureClashDiagnostics/output.txt @@ -1,9 +1,9 @@ -native/native.tests/testData/compilerOutput/SignatureClashDiagnostics/main.kt:4:5: error: platform declaration clash: The following declarations have the same KLIB signature (com.example.klib.serialization.diagnostics/A.foo|foo(){}[0]): +native/native.tests/testData/compilerOutput/SignatureClashDiagnostics/main.kt:4:5: error: platform declaration clash: The following declarations have the same IR signature (com.example.klib.serialization.diagnostics/A.foo|foo(){}[0]): fun foo(): kotlin.String defined in com.example.klib.serialization.diagnostics.A fun foo(): kotlin.Int defined in com.example.klib.serialization.diagnostics.A @Deprecated("", level = DeprecationLevel.HIDDEN) ^ -native/native.tests/testData/compilerOutput/SignatureClashDiagnostics/main.kt:7:5: error: platform declaration clash: The following declarations have the same KLIB signature (com.example.klib.serialization.diagnostics/A.foo|foo(){}[0]): +native/native.tests/testData/compilerOutput/SignatureClashDiagnostics/main.kt:7:5: error: platform declaration clash: The following declarations have the same IR signature (com.example.klib.serialization.diagnostics/A.foo|foo(){}[0]): fun foo(): kotlin.String defined in com.example.klib.serialization.diagnostics.A fun foo(): kotlin.Int defined in com.example.klib.serialization.diagnostics.A fun foo(): Int = 0