From dd3bebb69075e51784e277e509b24dcedcf66496 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 22 Jun 2023 21:47:14 +0200 Subject: [PATCH] Remove obsolete directives in diagnostic backend tests --- .../accidentalOverrides/defaultFunction.kt | 1 - .../delegatedFunctionOverriddenByProperty.fir.kt | 1 - .../delegatedFunctionOverriddenByProperty.kt | 1 - .../accidentalOverrides/overridesNothing.kt | 1 - .../traitFunctionOverriddenByProperty.fir.kt | 1 - .../accidentalOverrides/traitFunctionOverriddenByProperty.kt | 1 - .../accidentalOverrides/traitPropertyOverriddenByFunction.kt | 4 ++-- .../duplicateJvmSignature/bridges/class.kt | 1 - .../duplicateJvmSignature/bridges/fakeOverrideTrait.kt | 1 - .../duplicateJvmSignature/bridges/trait.kt | 1 - .../erasure/clashFromInterfaceAndSuperClass.kt | 1 - .../duplicateJvmSignature/erasure/inheritFromTwoTraits.kt | 1 - .../erasure/superTraitAndDelegationToTraitImpl.kt | 1 - .../duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt | 1 - .../finalMembersFromBuiltIns/waitNotifyGetClass.kt | 1 - .../duplicateJvmSignature/functionAndProperty/trait.fir.kt | 2 -- .../duplicateJvmSignature/functionAndProperty/trait.kt | 2 -- .../inlineClasses/declarationClash.fir.kt | 1 - .../duplicateJvmSignature/inlineClasses/declarationClash.kt | 1 - .../duplicateJvmSignature/specialNames/classObject.kt | 1 - .../specialNames/classObjectCopiedFieldObject.kt | 1 - .../duplicateJvmSignature/specialNames/defaults.kt | 1 - .../duplicateJvmSignature/specialNames/delegationBy.kt | 1 - .../duplicateJvmSignature/specialNames/innerClassField.kt | 1 - .../duplicateJvmSignature/specialNames/instance.kt | 1 - .../specialNames/propertyMetadataCache.kt | 1 - .../duplicateJvmSignature/traitImpl/defaultVsNonDefault.kt | 4 ++-- .../duplicateJvmSignature/traitImpl/oneTrait.kt | 4 ++-- .../traitImpl/traitFunctionOverriddenByPropertyInTrait.fir.kt | 2 -- .../traitImpl/traitFunctionOverriddenByPropertyInTrait.kt | 2 -- .../traitImpl/traitPropertyOverriddenByFunctionInTrait.kt | 1 - .../duplicateJvmSignature/traitImpl/twoTraits.kt | 1 - .../valueClasses/declarationClash.fir.kt | 1 - .../duplicateJvmSignature/valueClasses/declarationClash.kt | 1 - .../diagnostics/testsWithJvmBackend/indirectInlineCycle.kt | 2 +- .../testData/diagnostics/testsWithJvmBackend/inlineCycle.kt | 2 +- .../testsWithJvmBackend/multipleBigArityFunsImplemented.kt | 4 ++-- .../diagnostics/testsWithJvmBackend/propertyInlineCycle.kt | 2 +- .../testsWithJvmBackend/scripts/enumCapturesProperty.kts | 2 +- .../testsWithJvmBackend/scripts/enumEntryCapturesProperty.kts | 2 +- .../testsWithJvmBackend/scripts/interfaceCapturesProperty.kts | 2 +- .../scripts/nestedAndOuterClassesCaptureProperty.kts | 2 +- .../scripts/nestedClassCapturesProperty.kts | 2 +- .../scripts/nestedToObjectClassCapturesProperty.kts | 2 +- .../testsWithJvmBackend/scripts/objectCapturesProperty.kts | 2 +- .../scripts/objectCapturesPropertyIndirect.kts | 2 +- .../scripts/objectCapturesPropertyViaExtension1.kts | 2 +- .../scripts/objectCapturesPropertyViaExtension2.kts | 2 +- .../diagnostics/testsWithJvmBackend/suspendInlineCycle.kt | 2 +- 49 files changed, 22 insertions(+), 57 deletions(-) diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt index 3d2df630b69..dcdaab42ff3 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt @@ -1,5 +1,4 @@ // FIR_IDENTICAL -// TARGET_BACKEND: JVM_IR // !DIAGNOSTICS: -UNUSED_PARAMETER open class Base { diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.fir.kt index 1fd222dacf6..85073e1666a 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.fir.kt @@ -1,4 +1,3 @@ -// TARGET_BACKEND: JVM_IR interface B { fun getX() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt index 3bb7b70c3c3..dc78aa21e83 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt @@ -1,4 +1,3 @@ -// TARGET_BACKEND: JVM_IR interface B { fun getX() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt index 5573efc1148..ca96c2a46d8 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt @@ -1,5 +1,4 @@ // FIR_IDENTICAL -// TARGET_BACKEND: JVM_IR interface B { fun getX() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.fir.kt index d260c377569..b9e4cf5f057 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.fir.kt @@ -1,4 +1,3 @@ -// TARGET_BACKEND: JVM_IR interface T { fun getX() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt index 53ca83bbeaa..f8f3d413c83 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt @@ -1,4 +1,3 @@ -// TARGET_BACKEND: JVM_IR interface T { fun getX() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt index 58cbb158692..2b6641460fa 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt @@ -1,5 +1,5 @@ // FIR_IDENTICAL -// TARGET_BACKEND: JVM_IR + interface T { val x: Int get() = 1 @@ -7,4 +7,4 @@ interface T { class C : T { fun getX() = 1 -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class.kt index 8a38b5b7ad6..b2cfcf398c8 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class.kt @@ -1,6 +1,5 @@ // FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -// TARGET_BACKEND: JVM_IR open class B { open fun foo(t: T) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait.kt index f9678ba0d7d..111ee53b25f 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait.kt @@ -1,6 +1,5 @@ // FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -// TARGET_BACKEND: JVM_IR interface B { fun foo(t: T) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait.kt index 525b978e631..8332516c771 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait.kt @@ -1,6 +1,5 @@ // FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -// TARGET_BACKEND: JVM_IR interface B { fun foo(t: T) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt index d255c96dc0e..3b66fcc0924 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt @@ -1,6 +1,5 @@ // FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -// TARGET_BACKEND: JVM_IR public open class A { fun foo(x: T) = "O" diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt index 19e032f16b9..132b5ace90c 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt @@ -1,6 +1,5 @@ // FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -// TARGET_BACKEND: JVM_IR interface Foo { fun foo(l: List) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt index bb9b9a72862..b1dc2c2191a 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt @@ -1,6 +1,5 @@ // FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -// TARGET_BACKEND: JVM_IR interface A { fun foo(l: List) diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt index 50f7991c528..13d4ddcbf99 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt @@ -1,6 +1,5 @@ // FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -// TARGET_BACKEND: JVM_IR interface Foo { fun foo(l: List) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt index 688b40f4ec8..f549f797d1c 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt @@ -1,6 +1,5 @@ // FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -// TARGET_BACKEND: JVM_IR // KT-7174 Report error on members with the same signature as non-overridable methods from mapped Java types (like Object.wait/notify) diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.fir.kt index c7e9f02a6bd..377cef7e93e 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.fir.kt @@ -1,5 +1,3 @@ -// TARGET_BACKEND: JVM_IR - interface T { val x: Int get() = 1 diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.kt index 5a3a90c5781..81fca7ab9c5 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.kt @@ -1,5 +1,3 @@ -// TARGET_BACKEND: JVM_IR - interface T { val x: Int get() = 1 diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/inlineClasses/declarationClash.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/inlineClasses/declarationClash.fir.kt index f9eb8cd3879..f47c76b2fb9 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/inlineClasses/declarationClash.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/inlineClasses/declarationClash.fir.kt @@ -1,5 +1,4 @@ // WITH_STDLIB -// TARGET_BACKEND: JVM_IR @JvmInline value class A(val x: Int) { diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/inlineClasses/declarationClash.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/inlineClasses/declarationClash.kt index d20d6b30c6d..d6518c301c5 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/inlineClasses/declarationClash.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/inlineClasses/declarationClash.kt @@ -1,5 +1,4 @@ // WITH_STDLIB -// TARGET_BACKEND: JVM_IR @JvmInline value class A(val x: Int) { diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject.kt index 8982d351a0a..b8674242388 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject.kt @@ -1,5 +1,4 @@ // FIR_IDENTICAL -// TARGET_BACKEND: JVM_IR class C { companion object {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt index d7609966eb4..f4bdc63a3dc 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt @@ -1,5 +1,4 @@ // FIR_IDENTICAL -// TARGET_BACKEND: JVM_IR class B { companion object A { diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.kt index 00a091e24d1..814ced9cf29 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.kt @@ -1,5 +1,4 @@ // FIR_IDENTICAL -// TARGET_BACKEND: JVM_IR // !DIAGNOSTICS: -UNUSED_PARAMETER class C { diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy.kt index c7585b86b48..653a3d4b589 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy.kt @@ -1,5 +1,4 @@ // FIR_IDENTICAL -// TARGET_BACKEND: JVM_IR interface Foo diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField.kt index 5f709661c6c..a371d8b71dd 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField.kt @@ -1,6 +1,5 @@ // FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -// TARGET_BACKEND: JVM_IR class C { inner class D { diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.kt index 72373a421d6..49ecbcf6568 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.kt @@ -1,5 +1,4 @@ // FIR_IDENTICAL -// TARGET_BACKEND: JVM_IR object O { val INSTANCE: O = null!! diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache.kt index 0d025599262..2992aeaade6 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache.kt @@ -1,6 +1,5 @@ // FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -// TARGET_BACKEND: JVM_IR import kotlin.reflect.KProperty diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault.kt index 437d56e282a..c769a8fccc1 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault.kt @@ -1,5 +1,5 @@ // FIR_IDENTICAL -// TARGET_BACKEND: JVM_IR + interface Base1 { fun getX(): Int } @@ -9,4 +9,4 @@ interface Base2 { get() = 1 } -interface Test : Base1, Base2 \ No newline at end of file +interface Test : Base1, Base2 diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait.kt index 426df45e9fb..06f0e31bffd 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait.kt @@ -1,9 +1,9 @@ // FIR_IDENTICAL -// TARGET_BACKEND: JVM_IR + interface T { fun getX() = 1 } class C : T { val x = 1 -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.fir.kt index 3e5925f4479..32381a3c31c 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.fir.kt @@ -1,5 +1,3 @@ -// TARGET_BACKEND: JVM_IR - interface T { fun getX() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt index 2fc8610adc4..77b0641286e 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt @@ -1,5 +1,3 @@ -// TARGET_BACKEND: JVM_IR - interface T { fun getX() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt index eb358b160e4..f87f32f2483 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt @@ -1,5 +1,4 @@ // FIR_IDENTICAL -// TARGET_BACKEND: JVM_IR interface T { val x: Int diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits.kt index 9a171462690..a205e63ee4e 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits.kt @@ -1,5 +1,4 @@ // FIR_IDENTICAL -// TARGET_BACKEND: JVM_IR interface T1 { fun getX() = 1 diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.fir.kt index 712802dff68..f2ce85eab0f 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.fir.kt @@ -1,6 +1,5 @@ // !LANGUAGE: +ValueClasses // WITH_STDLIB -// TARGET_BACKEND: JVM_IR @JvmInline value class A(val x: Int, val y: Int) { diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.kt index 16011d6ca94..9d024d14dae 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.kt @@ -1,6 +1,5 @@ // !LANGUAGE: +ValueClasses // WITH_STDLIB -// TARGET_BACKEND: JVM_IR @JvmInline value class A(val x: Int, val y: Int) { diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.kt b/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.kt index 2102e8d1471..d6188edd8b1 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.kt @@ -1,6 +1,6 @@ // FIR_IDENTICAL // !RENDER_DIAGNOSTICS_FULL_TEXT -// TARGET_BACKEND: JVM_IR + inline fun inlineFun1(crossinline p: () -> Unit) { object { fun method() { inlineFun2(p) } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.kt b/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.kt index 853d8fd6247..024ae594780 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.kt @@ -1,6 +1,6 @@ // FIR_IDENTICAL // !RENDER_DIAGNOSTICS_FULL_TEXT -// TARGET_BACKEND: JVM_IR + inline fun inlineFun1(p: () -> Unit) { p() inlineFun2(p) diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.kt b/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.kt index c2e3499984d..2c2564c4eee 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.kt @@ -1,5 +1,5 @@ // FIR_IDENTICAL -// TARGET_BACKEND: JVM_IR + class Fun : (Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int) -> Int, @@ -18,4 +18,4 @@ class Fun : p20: Int, p21: Int, p22: Int, p23: Int, p24: Int, p25: Int, p26: Int, p27: Int, p28: Int, p29: Int, p30: Int, p31: Int, p32: Int ): Int = 333 -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/propertyInlineCycle.kt b/compiler/testData/diagnostics/testsWithJvmBackend/propertyInlineCycle.kt index adc7bf71536..c3e002a5674 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/propertyInlineCycle.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/propertyInlineCycle.kt @@ -1,4 +1,4 @@ // FIR_IDENTICAL -// TARGET_BACKEND: JVM + inline val String.foo: String get() = foo diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumCapturesProperty.kts b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumCapturesProperty.kts index e2a40d9eb60..9b02964e5c9 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumCapturesProperty.kts +++ b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumCapturesProperty.kts @@ -1,7 +1,7 @@ // !RENDER_DIAGNOSTICS_FULL_TEXT -// TARGET_BACKEND: JVM_IR // KT-30616 + val foo = "hello" enum class Bar(val s: String = foo) { diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumEntryCapturesProperty.kts b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumEntryCapturesProperty.kts index f65bdd94f61..b3adab02a90 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumEntryCapturesProperty.kts +++ b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumEntryCapturesProperty.kts @@ -1,7 +1,7 @@ // !RENDER_DIAGNOSTICS_FULL_TEXT -// TARGET_BACKEND: JVM_IR // KT-30616 + val foo = "hello" enum class Bar(val s: String) { diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/interfaceCapturesProperty.kts b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/interfaceCapturesProperty.kts index 5b804ee8898..d7097272c71 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/interfaceCapturesProperty.kts +++ b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/interfaceCapturesProperty.kts @@ -1,5 +1,5 @@ // !RENDER_DIAGNOSTICS_FULL_TEXT -// TARGET_BACKEND: JVM_IR + fun foo() = B().bar() diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/nestedAndOuterClassesCaptureProperty.kts b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/nestedAndOuterClassesCaptureProperty.kts index d98fd168ed0..2730f1c7715 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/nestedAndOuterClassesCaptureProperty.kts +++ b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/nestedAndOuterClassesCaptureProperty.kts @@ -1,7 +1,7 @@ // !RENDER_DIAGNOSTICS_FULL_TEXT -// TARGET_BACKEND: JVM_IR // KT-19423 variation + val used = "abc" class Outer { diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/nestedClassCapturesProperty.kts b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/nestedClassCapturesProperty.kts index e1d8fb9b3da..202a446f379 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/nestedClassCapturesProperty.kts +++ b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/nestedClassCapturesProperty.kts @@ -1,7 +1,7 @@ // !RENDER_DIAGNOSTICS_FULL_TEXT -// TARGET_BACKEND: JVM_IR // KT-19423 variation + val used = "abc" class Outer { diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/nestedToObjectClassCapturesProperty.kts b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/nestedToObjectClassCapturesProperty.kts index 97f14f79374..c2c364be42e 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/nestedToObjectClassCapturesProperty.kts +++ b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/nestedToObjectClassCapturesProperty.kts @@ -1,7 +1,7 @@ // !RENDER_DIAGNOSTICS_FULL_TEXT -// TARGET_BACKEND: JVM_IR // KT-19423 variation + val used = "abc" object Outer { diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/objectCapturesProperty.kts b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/objectCapturesProperty.kts index 3311301567b..d46fb9e6bb3 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/objectCapturesProperty.kts +++ b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/objectCapturesProperty.kts @@ -1,5 +1,5 @@ // !RENDER_DIAGNOSTICS_FULL_TEXT -// TARGET_BACKEND: JVM_IR + fun foo() = B.bar() diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/objectCapturesPropertyIndirect.kts b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/objectCapturesPropertyIndirect.kts index 1cc0b35a5cf..54514392d27 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/objectCapturesPropertyIndirect.kts +++ b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/objectCapturesPropertyIndirect.kts @@ -1,5 +1,5 @@ // !RENDER_DIAGNOSTICS_FULL_TEXT -// TARGET_BACKEND: JVM_IR + fun foo() = B.bar() diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/objectCapturesPropertyViaExtension1.kts b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/objectCapturesPropertyViaExtension1.kts index 8a675327ea2..9ffabcc0eae 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/objectCapturesPropertyViaExtension1.kts +++ b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/objectCapturesPropertyViaExtension1.kts @@ -1,5 +1,5 @@ // !RENDER_DIAGNOSTICS_FULL_TEXT -// TARGET_BACKEND: JVM_IR + // see KT-49443 // two similar examples check dependency on declarations ordering diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/objectCapturesPropertyViaExtension2.kts b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/objectCapturesPropertyViaExtension2.kts index ecef5cf9659..bd5b716fcfe 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/objectCapturesPropertyViaExtension2.kts +++ b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/objectCapturesPropertyViaExtension2.kts @@ -1,5 +1,5 @@ // !RENDER_DIAGNOSTICS_FULL_TEXT -// TARGET_BACKEND: JVM_IR + // see KT-49443 // two similar examples check dependency on declarations ordering diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.kt b/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.kt index de4d5c413ae..424441f0d33 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.kt @@ -1,6 +1,6 @@ // FIR_IDENTICAL // !RENDER_DIAGNOSTICS_FULL_TEXT -// TARGET_BACKEND: JVM_IR + suspend inline fun inlineFun1(p: () -> Unit) { p() inlineFun2(p)