From 185e74fd2637ae7bfc79c55b9e7f90534e62a3ea Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 14 Oct 2022 09:20:52 +0200 Subject: [PATCH] Minor: add Suppress usage to CONFLICTING_JVM_DECLARATIONS test Related to KT-54366 --- compiler/testData/cli/jvm/conflictingJvmDeclarations.kt | 1 + compiler/testData/cli/jvm/conflictingJvmDeclarations.out | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/compiler/testData/cli/jvm/conflictingJvmDeclarations.kt b/compiler/testData/cli/jvm/conflictingJvmDeclarations.kt index f5cfc6722a1..5a8a0455aea 100644 --- a/compiler/testData/cli/jvm/conflictingJvmDeclarations.kt +++ b/compiler/testData/cli/jvm/conflictingJvmDeclarations.kt @@ -2,6 +2,7 @@ class Foo { val x: Int get() = 42 + @Suppress("CONFLICTING_JVM_DECLARATIONS") fun getX() = 42 @JvmName("getX") diff --git a/compiler/testData/cli/jvm/conflictingJvmDeclarations.out b/compiler/testData/cli/jvm/conflictingJvmDeclarations.out index 75a83b048be..04477b8c572 100644 --- a/compiler/testData/cli/jvm/conflictingJvmDeclarations.out +++ b/compiler/testData/cli/jvm/conflictingJvmDeclarations.out @@ -7,13 +7,7 @@ compiler/testData/cli/jvm/conflictingJvmDeclarations.kt:2:5: error: platform dec fun getY(): Int defined in Foo val x: Int ^ -compiler/testData/cli/jvm/conflictingJvmDeclarations.kt:5:5: error: platform declaration clash: The following declarations have the same JVM signature (getX()I): - fun ``(): Int defined in Foo - fun getX(): Int defined in Foo - fun getY(): Int defined in Foo - fun getX() = 42 - ^ -compiler/testData/cli/jvm/conflictingJvmDeclarations.kt:7:5: error: platform declaration clash: The following declarations have the same JVM signature (getX()I): +compiler/testData/cli/jvm/conflictingJvmDeclarations.kt:8:5: error: platform declaration clash: The following declarations have the same JVM signature (getX()I): fun ``(): Int defined in Foo fun getX(): Int defined in Foo fun getY(): Int defined in Foo