From 965946d3efa43a3cd2c7852e201d4a512c0d81a0 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 27 Jul 2023 19:12:36 +0200 Subject: [PATCH] K2: report JVM backend errors in the same way in PSI as LT Do not try to find PSI element, but always use the IR element offsets instead. This greatly simplifies test data because we don't need to have custom PSI- and LT- based diagnostic ranges in every test, and K1/K2 behavior also is mostly the same. The exact offset ranges are not as important for backend diagnostics, so it's better to have K2+PSI and K2+LT behaving the same. --- ...osticReporterWithImplicitIrBasedContext.kt | 16 ------------ .../jvm/codegen/JvmSignatureClashDetector.kt | 7 +++-- .../cli/jvm/conflictingJvmDeclarations.out | 4 +-- compiler/testData/cli/jvm/signatureClash.out | 4 +-- ...ticAccessorForPropertiesSignatureClash.out | 16 ++++++------ ...icAccessorPropertyAndFunSignatureClash.out | 16 ++++++------ .../jvm/syntheticAccessorSignatureClash.out | 24 ++++++++--------- .../accidentalOverrideFromGrandparent.fir.kt | 15 ----------- .../accidentalOverrideFromGrandparent.kt | 6 ++--- .../classFunctionOverriddenByProperty.fir.kt | 4 +-- .../classFunctionOverriddenByProperty.kt | 4 +-- ...unctionOverriddenByPropertyNoGetter.fir.kt | 9 ------- ...assFunctionOverriddenByPropertyNoGetter.kt | 4 +-- .../classPropertyOverriddenByFunction.fir.kt | 10 ------- .../classPropertyOverriddenByFunction.kt | 4 +-- .../defaultFunction.fir.kt | 10 ------- .../accidentalOverrides/defaultFunction.kt | 4 +-- .../delegatedFunctionOverriddenByProperty.kt | 2 +- .../genericClassFunction.fir.kt | 10 ------- .../genericClassFunction.kt | 4 +-- .../overridesNothing.fir.kt | 4 +-- .../accidentalOverrides/overridesNothing.kt | 4 +-- .../traitFunctionOverriddenByProperty.fir.kt | 4 +-- .../traitFunctionOverriddenByProperty.kt | 4 +-- ...tFunctionOverriddenByPropertyNoImpl.fir.kt | 4 +-- ...traitFunctionOverriddenByPropertyNoImpl.kt | 4 +-- .../traitPropertyOverriddenByFunction.fir.kt | 10 ------- .../traitPropertyOverriddenByFunction.kt | 4 +-- ...tPropertyOverriddenByFunctionNoImpl.fir.kt | 9 ------- ...traitPropertyOverriddenByFunctionNoImpl.kt | 4 +-- .../bridges/class.fir.kt | 12 --------- .../duplicateJvmSignature/bridges/class.kt | 4 +-- .../bridges/fakeOverrideTrait.fir.kt | 10 ------- .../bridges/fakeOverrideTrait.kt | 4 +-- .../bridges/trait.fir.kt | 12 --------- .../duplicateJvmSignature/bridges/trait.kt | 4 +-- .../caseInProperties.fir.kt | 4 --- .../duplicateJvmSignature/caseInProperties.kt | 6 ++--- ...dinaryClassIsBinaryCompatibleChange.fir.kt | 8 ------ ...OfOrdinaryClassIsBinaryCompatibleChange.kt | 6 ++--- .../clashFromInterfaceAndSuperClass.fir.kt | 20 -------------- .../clashFromInterfaceAndSuperClass.kt | 6 ++--- .../erasure/collections.fir.kt | 5 ---- .../erasure/collections.kt | 6 ++--- .../erasure/delegateToTwoTraits.fir.kt | 15 ----------- .../erasure/delegateToTwoTraits.kt | 6 ++--- .../erasure/delegationAndOwnMethod.fir.kt | 10 ------- .../erasure/delegationAndOwnMethod.kt | 8 +++--- .../delegationToTraitImplAndOwnMethod.fir.kt | 16 ------------ .../delegationToTraitImplAndOwnMethod.kt | 8 +++--- .../erasure/extensionProperties.fir.kt | 6 ++--- .../erasure/extensionProperties.kt | 6 ++--- .../erasure/genericType.fir.kt | 7 ----- .../erasure/genericType.kt | 6 ++--- .../erasure/inheritFromTwoTraits.fir.kt | 13 ---------- .../erasure/inheritFromTwoTraits.kt | 6 ++--- .../erasure/kotlinAndJavaCollections.fir.kt | 5 ---- .../erasure/kotlinAndJavaCollections.kt | 6 ++--- .../erasure/nullableType.fir.kt | 5 ---- .../erasure/nullableType.kt | 6 ++--- .../superTraitAndDelegationToTraitImpl.fir.kt | 14 ---------- .../superTraitAndDelegationToTraitImpl.kt | 4 +-- .../erasure/twoTraitsAndOwnFunction.fir.kt | 14 ---------- .../erasure/twoTraitsAndOwnFunction.kt | 4 +-- .../erasure/typeMappedToJava.fir.kt | 5 ---- .../erasure/typeMappedToJava.kt | 6 ++--- .../erasure/typeParameter.fir.kt | 5 ---- .../erasure/typeParameter.kt | 6 ++--- .../erasure/typeParameterWithBound.fir.kt | 7 ----- .../erasure/typeParameterWithBound.kt | 6 ++--- .../erasure/typeParameterWithTwoBounds.fir.kt | 9 ------- .../erasure/typeParameterWithTwoBounds.kt | 6 ++--- .../typeParameterWithTwoBoundsInWhere.fir.kt | 9 ------- .../typeParameterWithTwoBoundsInWhere.kt | 6 ++--- .../enumMembers.fir.kt | 4 +-- .../finalMembersFromBuiltIns/enumMembers.kt | 2 -- .../waitNotifyGetClass.fir.kt | 20 -------------- .../waitNotifyGetClass.kt | 26 +++++++++---------- .../functionAndProperty/class.fir.kt | 6 ----- .../functionAndProperty/class.kt | 6 ++--- .../functionAndProperty/classObject.fir.kt | 8 ------ .../functionAndProperty/classObject.kt | 6 ++--- .../classPropertyInConstructor.fir.kt | 5 ---- .../classPropertyInConstructor.kt | 4 +-- .../extensionFunctionAndNormalFunction.fir.kt | 7 ----- .../extensionFunctionAndNormalFunction.kt | 6 ++--- .../extensionPropertyAndFunction.fir.kt | 5 ++-- .../extensionPropertyAndFunction.kt | 5 ++-- .../functionAndSetter.fir.kt | 8 ------ .../functionAndProperty/functionAndSetter.kt | 6 ++--- .../functionAndProperty/functionAndVar.fir.kt | 5 ++-- .../functionAndProperty/functionAndVar.kt | 5 ++-- .../functionAndProperty/localClass.fir.kt | 8 ------ .../functionAndProperty/localClass.kt | 6 ++--- .../localClassInClass.fir.kt | 10 ------- .../functionAndProperty/localClassInClass.kt | 6 ++--- .../functionAndProperty/nestedClass.fir.kt | 8 ------ .../functionAndProperty/nestedClass.kt | 6 ++--- .../functionAndProperty/object.fir.kt | 6 ----- .../functionAndProperty/object.kt | 6 ++--- .../objectExpression.fir.kt | 7 ----- .../functionAndProperty/objectExpression.kt | 6 ++--- .../objectExpressionInConstructor.fir.kt | 8 ------ .../objectExpressionInConstructor.kt | 6 ++--- .../functionAndProperty/topLevel.fir.kt | 4 --- .../functionAndProperty/topLevel.kt | 6 ++--- .../functionAndProperty/topLevelGetter.fir.kt | 6 ++--- .../functionAndProperty/topLevelGetter.kt | 6 ++--- .../functionAndProperty/trait.fir.kt | 6 ++--- .../functionAndProperty/trait.kt | 6 ++--- .../inlineClasses/declarationClash.fir.kt | 5 ++-- .../inlineClasses/declarationClash.kt | 13 +++++----- .../classObjectCopiedField.fir.kt | 10 ------- .../specialNames/classObjectCopiedField.kt | 6 ++--- .../classObjectCopiedFieldObject.fir.kt | 20 -------------- .../classObjectCopiedFieldObject.kt | 6 ++--- .../specialNames/dataClassCopy.fir.kt | 6 ----- .../specialNames/dataClassCopy.kt | 8 +++--- .../specialNames/defaults.fir.kt | 7 ----- .../specialNames/defaults.kt | 6 ++--- .../specialNames/enum.fir.kt | 9 ------- .../specialNames/enum.kt | 10 +++---- .../specialNames/instance.fir.kt | 9 ------- .../specialNames/instance.kt | 6 ++--- .../duplicateJvmSignature/statics/jkjk.kt | 4 +-- .../statics/kotlinClassExtendsJavaClass.kt | 2 +- ...inClassExtendsJavaClassExtendsJavaClass.kt | 4 +-- .../synthesized/enumValuesValueOf.fir.kt | 14 ---------- .../synthesized/enumValuesValueOf.kt | 10 +++---- .../traitImpl/defaultVsNonDefault.fir.kt | 12 --------- .../traitImpl/defaultVsNonDefault.kt | 4 +-- .../traitImpl/kt43611.fir.kt | 5 ++-- .../traitImpl/kt43611.kt | 5 ++-- .../traitImpl/oneTrait.fir.kt | 9 ------- .../traitImpl/oneTrait.kt | 4 +-- ...FunctionOverriddenByPropertyInTrait.fir.kt | 4 +-- ...raitFunctionOverriddenByPropertyInTrait.kt | 4 +-- ...PropertyOverriddenByFunctionInTrait.fir.kt | 10 ------- ...raitPropertyOverriddenByFunctionInTrait.kt | 4 +-- .../traitImpl/twoTraits.fir.kt | 13 ---------- .../traitImpl/twoTraits.kt | 6 ++--- .../valueClasses/declarationClash.fir.kt | 11 ++++---- .../valueClasses/declarationClash.kt | 13 +++++----- .../duplicateJvmSignature/vararg.fir.kt | 11 -------- .../duplicateJvmSignature/vararg.kt | 14 +++++----- .../multipleBigArityFunsImplemented.fir.kt | 21 --------------- .../multipleBigArityFunsImplemented.kt | 6 ++--- .../experimental/jvmhost/test/ReplTest.kt | 4 +-- 148 files changed, 267 insertions(+), 860 deletions(-) delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/genericClassFunction.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/caseInProperties.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/collections.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegateToTwoTraits.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationAndOwnMethod.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/genericType.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/kotlinAndJavaCollections.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/nullableType.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeMappedToJava.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameter.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithBound.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/class.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classObject.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndSetter.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClass.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClassInClass.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/nestedClass.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/object.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpression.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevel.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedField.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/dataClassCopy.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/enum.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/synthesized/enumValuesValueOf.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/vararg.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.fir.kt diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/KtDiagnosticReporterWithImplicitIrBasedContext.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/KtDiagnosticReporterWithImplicitIrBasedContext.kt index 9b942afea3a..9af9faa5c73 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/KtDiagnosticReporterWithImplicitIrBasedContext.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/KtDiagnosticReporterWithImplicitIrBasedContext.kt @@ -36,22 +36,6 @@ class KtDiagnosticReporterWithImplicitIrBasedContext( (PsiSourceManager.findPsiElement(this, containingIrFile)?.let(::KtRealPsiSourceElement) ?: sourceElement()) - fun atFirstValidFrom(vararg irElements: IrElement, containingIrFile: IrFile): DiagnosticContextImpl? = - atFirstValidFrom(irElements.asIterable(), containingIrFile) - - fun atFirstValidFrom(irElements: Iterable, containingIrFile: IrFile): DiagnosticContextImpl? { - var irElement: IrElement? = null - for (e in irElements) { - PsiSourceManager.findPsiElement(e, containingIrFile)?.let { - return at(KtRealPsiSourceElement(it), e, containingIrFile) - } - if (irElement == null && e.startOffset >= 0) { - irElement = e - } - } - return irElement?.let { at(it.sourceElement(), it, containingIrFile) } - } - fun at(irElement: IrElement, containingIrDeclaration: IrDeclaration): DiagnosticContextImpl = at(irElement, containingIrDeclaration.file) diff --git a/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmSignatureClashDetector.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmSignatureClashDetector.kt index 123629f68a8..ac3595f5b48 100644 --- a/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmSignatureClashDetector.kt +++ b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmSignatureClashDetector.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.backend.jvm.codegen import org.jetbrains.kotlin.backend.common.lower.ANNOTATION_IMPLEMENTATION +import org.jetbrains.kotlin.backend.common.sourceElement import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.diagnostics.KtDiagnosticFactory1 @@ -145,8 +146,10 @@ class JvmSignatureClashDetector( irDeclarations: Collection, conflictingJvmDeclarationsData: ConflictingJvmDeclarationsData ) { - irDeclarations.mapNotNullTo(LinkedHashSet()) { irDeclaration -> - classCodegen.context.ktDiagnosticReporter.atFirstValidFrom(irDeclaration, classCodegen.irClass, containingIrFile = irDeclaration.file) + irDeclarations.mapTo(LinkedHashSet()) { irDeclaration -> + // Offset can be negative (SYNTHETIC_OFFSET) for delegated members; report an error on the class in that case. + val reportOn = irDeclaration.takeUnless { it.startOffset < 0 } ?: classCodegen.irClass + classCodegen.context.ktDiagnosticReporter.at(reportOn.sourceElement(), reportOn, irDeclaration.file) }.forEach { it.report(diagnosticFactory1, conflictingJvmDeclarationsData) } diff --git a/compiler/testData/cli/jvm/conflictingJvmDeclarations.out b/compiler/testData/cli/jvm/conflictingJvmDeclarations.out index a50d64fa1cc..11eb79613bc 100644 --- a/compiler/testData/cli/jvm/conflictingJvmDeclarations.out +++ b/compiler/testData/cli/jvm/conflictingJvmDeclarations.out @@ -4,10 +4,10 @@ compiler/testData/cli/jvm/conflictingJvmDeclarations.kt:3:9: error: platform dec fun getY(): Int defined in Foo get() = 42 ^ -compiler/testData/cli/jvm/conflictingJvmDeclarations.kt:8:5: error: platform declaration clash: The following declarations have the same JVM signature (getX()I): +compiler/testData/cli/jvm/conflictingJvmDeclarations.kt:9: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 - @JvmName("getX") + fun getY() = 42 ^ COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/signatureClash.out b/compiler/testData/cli/jvm/signatureClash.out index 388a173e769..185ccf6ab9e 100644 --- a/compiler/testData/cli/jvm/signatureClash.out +++ b/compiler/testData/cli/jvm/signatureClash.out @@ -28,11 +28,11 @@ compiler/testData/cli/jvm/signatureClash.kt:20:5: error: accidental override: Th fun getTr(): Int defined in SubTr val tr = 1 ^ -compiler/testData/cli/jvm/signatureClash.kt:24:7: error: platform declaration clash: The following declarations have the same JVM signature (access$f(LC;)V): +compiler/testData/cli/jvm/signatureClash.kt:24:1: error: platform declaration clash: The following declarations have the same JVM signature (access$f(LC;)V): fun `access$f`(`$this`: C): Unit defined in C fun `access$f`(c: C): Unit defined in C class C { - ^ +^ compiler/testData/cli/jvm/signatureClash.kt:26:5: error: platform declaration clash: The following declarations have the same JVM signature (access$f(LC;)V): fun `access$f`(`$this`: C): Unit defined in C fun `access$f`(c: C): Unit defined in C diff --git a/compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.out b/compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.out index 95e33f76f20..07b4eca498a 100644 --- a/compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.out +++ b/compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.out @@ -1,23 +1,23 @@ -compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:3:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I): +compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:3:1: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I): fun `access$getFoo$p`(`$this`: A): Int defined in A fun `access$getFoo$p`(a: A): Int defined in A class A { - ^ -compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:3:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V): +^ +compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:3:1: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V): fun `access$setFoo$p`(`$this`: A, ``: Int): Unit defined in A fun `access$setFoo$p`(a: A, d: Int): Unit defined in A class A { - ^ -compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:3:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$cp()I): +^ +compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:3:1: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$cp()I): fun `access$getFoo$cp`(): Int defined in A fun `access$getFoo$cp`(): Int defined in A class A { - ^ -compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:3:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$cp(I)V): +^ +compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:3:1: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$cp(I)V): fun `access$setFoo$cp`(``: Int): Unit defined in A fun `access$setFoo$cp`(d: Int): Unit defined in A class A { - ^ +^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:6:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I): fun `access$getFoo$p`(`$this`: A): Int defined in A fun `access$getFoo$p`(a: A): Int defined in A diff --git a/compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.out b/compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.out index ac66c774877..e8a419dd6fb 100644 --- a/compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.out +++ b/compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.out @@ -1,23 +1,23 @@ -compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:3:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I): +compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:3:1: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I): fun `access$getFoo$p`(`$this`: A): Int defined in A fun `access$getFoo$p`(a: A): Int defined in A class A { - ^ -compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:3:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V): +^ +compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:3:1: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V): fun `access$setFoo$p`(`$this`: A, ``: Int): Unit defined in A fun `access$setFoo$p`(a: A, d: Int): Unit defined in A class A { - ^ -compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:3:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo(LA;)I): +^ +compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:3:1: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo(LA;)I): fun `access$getFoo`(`$this`: A): Int defined in A fun `access$getFoo`(a: A): Int defined in A class A { - ^ -compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:3:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo(LA;I)V): +^ +compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:3:1: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo(LA;I)V): fun `access$setFoo`(`$this`: A, i: Int): Unit defined in A fun `access$setFoo`(a: A, d: Int): Unit defined in A class A { - ^ +^ compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:6:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I): fun `access$getFoo$p`(`$this`: A): Int defined in A fun `access$getFoo$p`(a: A): Int defined in A diff --git a/compiler/testData/cli/jvm/syntheticAccessorSignatureClash.out b/compiler/testData/cli/jvm/syntheticAccessorSignatureClash.out index d33c42b609b..af6ea27102d 100644 --- a/compiler/testData/cli/jvm/syntheticAccessorSignatureClash.out +++ b/compiler/testData/cli/jvm/syntheticAccessorSignatureClash.out @@ -1,31 +1,31 @@ -compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:14:7: error: accidental override: The following declarations have the same JVM signature (access$foo(LDerived;)V): +compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:14:1: error: accidental override: The following declarations have the same JVM signature (access$foo(LDerived;)V): fun `access$foo`(d: Derived): Unit defined in Derived fun `access$foo`(`$this`: Derived): Unit defined in Derived class Derived : Base() { - ^ -compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:14:7: error: accidental override: The following declarations have the same JVM signature (access$getBar$p(LDerived;)I): +^ +compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:14:1: error: accidental override: The following declarations have the same JVM signature (access$getBar$p(LDerived;)I): fun `access$getBar$p`(d: Derived): Int defined in Derived fun `access$getBar$p`(`$this`: Derived): Int defined in Derived class Derived : Base() { - ^ -compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:14:7: error: accidental override: The following declarations have the same JVM signature (access$setBar$p(LDerived;I)V): +^ +compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:14:1: error: accidental override: The following declarations have the same JVM signature (access$setBar$p(LDerived;I)V): fun `access$setBar$p`(d: Derived, i: Int): Unit defined in Derived fun `access$setBar$p`(`$this`: Derived, ``: Int): Unit defined in Derived class Derived : Base() { - ^ -compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:14:7: error: accidental override: The following declarations have the same JVM signature (access$getBaz$p(LDerived;)I): +^ +compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:14:1: error: accidental override: The following declarations have the same JVM signature (access$getBaz$p(LDerived;)I): fun `access$getBaz$p`(d: Derived): Int defined in Derived fun `access$getBaz$p`(`$this`: Derived): Int defined in Derived class Derived : Base() { - ^ -compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:14:7: error: accidental override: The following declarations have the same JVM signature (access$getBoo$p(LDerived;)I): +^ +compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:14:1: error: accidental override: The following declarations have the same JVM signature (access$getBoo$p(LDerived;)I): fun `access$getBoo$p`(d: Derived): Int defined in Derived fun `access$getBoo$p`(`$this`: Derived): Int defined in Derived class Derived : Base() { - ^ -compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:14:7: error: accidental override: The following declarations have the same JVM signature (access$setBar1$p(LDerived;I)V): +^ +compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:14:1: error: accidental override: The following declarations have the same JVM signature (access$setBar1$p(LDerived;I)V): fun `access$setBar1$p`(d: Derived, i: Int): Unit defined in Derived fun `access$setBar1$p`(`$this`: Derived, ``: Int): Unit defined in Derived class Derived : Base() { - ^ +^ COMPILATION_ERROR diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.fir.kt deleted file mode 100644 index 52f59b0e95c..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.fir.kt +++ /dev/null @@ -1,15 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER -interface Foo { - fun foo(x: X) -} - -open class FooImpl : Foo { - override fun foo(x: String) { - } -} - -open class FooImpl2 : FooImpl() { - fun foo(x: Any) { - } -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.kt index 9bb1905aaf8..ad131787162 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/accidentalOverrideFromGrandparent.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER interface Foo { fun foo(x: X) @@ -10,6 +10,6 @@ open class FooImpl : Foo { } open class FooImpl2 : FooImpl() { - fun foo(x: Any) { - } + fun foo(x: Any) { + } } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.fir.kt index 7cdafa1fa9c..dace5e2afd0 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.fir.kt @@ -1,10 +1,8 @@ -// COMPARE_WITH_LIGHT_TREE - open class B { fun getX() = 1 } class C : B() { - val x: Int + val x: Int get() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt index 39dc1b639e7..d93832524c9 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt @@ -1,10 +1,8 @@ -// COMPARE_WITH_LIGHT_TREE - open class B { fun getX() = 1 } class C : B() { val x: Int - get() = 1 + get() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.fir.kt deleted file mode 100644 index 676068a71af..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.fir.kt +++ /dev/null @@ -1,9 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -open class B { - fun getX() = 1 -} - -class C : B() { - val x: Int = 1 -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.kt index ccc4648cb72..10c47786ff0 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.kt @@ -1,9 +1,9 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL open class B { fun getX() = 1 } class C : B() { - val x: Int = 1 + val x: Int = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.fir.kt deleted file mode 100644 index 035dff7dd8a..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.fir.kt +++ /dev/null @@ -1,10 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -open class B { - val x: Int - get() = 1 -} - -class C : B() { - fun getX() = 1 -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt index ff50f157394..d0afa21dc06 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL open class B { val x: Int @@ -6,5 +6,5 @@ open class B { } class C : B() { - fun getX() = 1 + fun getX() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction.fir.kt deleted file mode 100644 index ce8ca162012..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction.fir.kt +++ /dev/null @@ -1,10 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -open class Base { - open fun `foo$default`(d: Derived, i: Int, mask: Int, mh: Any) {} -} - -class Derived : Base() { - fun foo(i: Int = 0) {} -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt index 64609a7c1e7..425d064c610 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER open class Base { @@ -6,5 +6,5 @@ open class Base { } class Derived : Base() { - fun foo(i: Int = 0) {} + fun foo(i: Int = 0) {} } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt index dc78aa21e83..5d7bdb1a2a0 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt @@ -6,4 +6,4 @@ interface D { val x: Int } -class C(d: D) : D by d, B \ No newline at end of file +class C(d: D) : D by d, B diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/genericClassFunction.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/genericClassFunction.fir.kt deleted file mode 100644 index 8f0c5740d9a..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/genericClassFunction.fir.kt +++ /dev/null @@ -1,10 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -open class B { - fun foo(l: List) {} -} - -class C : B() { - fun foo(l: List) {} -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/genericClassFunction.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/genericClassFunction.kt index e91c5a67d3b..6f998cacce0 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/genericClassFunction.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/genericClassFunction.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER open class B { @@ -6,5 +6,5 @@ open class B { } class C : B() { - fun foo(l: List) {} + fun foo(l: List) {} } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing.fir.kt index 245f99992a9..5c9b5fb6b1e 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing.fir.kt @@ -1,9 +1,7 @@ -// COMPARE_WITH_LIGHT_TREE - interface B { fun getX() = 1 } class C : B { - override val x = 1 + override val x = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt index cea703420aa..75ef848d758 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt @@ -1,9 +1,7 @@ -// COMPARE_WITH_LIGHT_TREE - interface B { fun getX() = 1 } class C : B { - override val x = 1 + override val x = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.fir.kt index 5250e70ff87..835c88a1310 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.fir.kt @@ -1,10 +1,8 @@ -// COMPARE_WITH_LIGHT_TREE - interface T { fun getX() = 1 } class C : T { - val x: Int + val x: Int get() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt index 102ca654346..b35bd4adf1e 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt @@ -1,10 +1,8 @@ -// COMPARE_WITH_LIGHT_TREE - interface T { fun getX() = 1 } class C : T { val x: Int - get() = 1 + get() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.fir.kt index 7d31a0368c7..92975678dc8 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.fir.kt @@ -1,10 +1,8 @@ -// COMPARE_WITH_LIGHT_TREE - interface T { fun getX(): Int } abstract class C : T { - val x: Int + val x: Int get() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.kt index e9a8e2b11d5..53c13f484dc 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.kt @@ -1,10 +1,8 @@ -// COMPARE_WITH_LIGHT_TREE - interface T { fun getX(): Int } abstract class C : T { val x: Int - get() = 1 + get() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.fir.kt deleted file mode 100644 index dd5e5b6b279..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.fir.kt +++ /dev/null @@ -1,10 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -interface T { - val x: Int - get() = 1 -} - -class C : 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 aad952e94e7..4544fe096a5 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL interface T { val x: Int @@ -6,5 +6,5 @@ interface T { } class C : T { - fun getX() = 1 + fun getX() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.fir.kt deleted file mode 100644 index 43f4eb6c2ea..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.fir.kt +++ /dev/null @@ -1,9 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -interface T { - val x: Int -} - -abstract class C : T { - fun getX() = 1 -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt index 25344c80389..6b402b71c22 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt @@ -1,9 +1,9 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL interface T { val x: Int } abstract class C : T { - fun getX() = 1 + fun getX() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class.fir.kt deleted file mode 100644 index 4a1f1c5e886..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class.fir.kt +++ /dev/null @@ -1,12 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -open class B { - open fun foo(t: T) {} -} - -class C : B() { - override fun foo(t: String) {} - - fun foo(o: Any) {} -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class.kt index 563307708fb..babadbab7fc 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER open class B { @@ -8,5 +8,5 @@ open class B { class C : B() { override fun foo(t: String) {} - fun foo(o: Any) {} + fun foo(o: Any) {} } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait.fir.kt deleted file mode 100644 index c350a2f6345..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait.fir.kt +++ /dev/null @@ -1,10 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface B { - fun foo(t: T) {} -} - -class C : B { - fun foo(o: Any) {} -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait.kt index 4cbfe2af193..79502827b0a 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER interface B { @@ -6,5 +6,5 @@ interface B { } class C : B { - fun foo(o: Any) {} + fun foo(o: Any) {} } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait.fir.kt deleted file mode 100644 index 2ae3cbfe7b1..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait.fir.kt +++ /dev/null @@ -1,12 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface B { - fun foo(t: T) {} -} - -class C : B { - override fun foo(t: String) {} - - fun foo(o: Any) {} -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait.kt index c03b5bce7b7..689dba69acd 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER interface B { @@ -8,5 +8,5 @@ interface B { class C : B { override fun foo(t: String) {} - fun foo(o: Any) {} + fun foo(o: Any) {} } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/caseInProperties.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/caseInProperties.fir.kt deleted file mode 100644 index e757c4c0641..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/caseInProperties.fir.kt +++ /dev/null @@ -1,4 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -val aa = 1 -val Aa = 1 diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/caseInProperties.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/caseInProperties.kt index 7ad53983c84..b855d929d25 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/caseInProperties.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/caseInProperties.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL -val aa = 1 -val Aa = 1 +val aa = 1 +val Aa = 1 diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.fir.kt deleted file mode 100644 index f5dab32febd..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !LANGUAGE: +InlineClasses, -JvmInlineValueClasses -// !DIAGNOSTICS: -UNUSED_PARAMETER - -inline class IC(val i: Int) - -fun foo(a: Any, ic: IC) {} -fun foo(a: Any?, ic: IC) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt index 3cd82d2ab9b..1f7608245de 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt @@ -1,8 +1,8 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !LANGUAGE: +InlineClasses, -JvmInlineValueClasses // !DIAGNOSTICS: -UNUSED_PARAMETER inline class IC(val i: Int) -fun foo(a: Any, ic: IC) {} -fun foo(a: Any?, ic: IC) {} +fun foo(a: Any, ic: IC) {} +fun foo(a: Any?, ic: IC) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.fir.kt deleted file mode 100644 index 20af4e6b487..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.fir.kt +++ /dev/null @@ -1,20 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -public open class A { - fun foo(x: T) = "O" - fun foo(x: A) = "K" -} - -interface C { - fun foo(x: E): String - fun foo(x: A): String -} - -interface D { - fun foo(x: A): String -} - -class B1 : A>(), D - -interface B2 : C>, D diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt index e045da5e2d7..77b78a055d2 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER public open class A { @@ -15,6 +15,6 @@ interface D { fun foo(x: A): String } -class B1 : A>(), D +class B1 : A>(), D -interface B2 : C>, D +interface B2 : C>, D diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/collections.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/collections.fir.kt deleted file mode 100644 index ee69af4329c..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/collections.fir.kt +++ /dev/null @@ -1,5 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -fun foo(s: List) {} -fun foo(s: MutableList) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/collections.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/collections.kt index bc9c2457461..976a0df984a 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/collections.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/collections.kt @@ -1,5 +1,5 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -fun foo(s: List) {} -fun foo(s: MutableList) {} +fun foo(s: List) {} +fun foo(s: MutableList) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegateToTwoTraits.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegateToTwoTraits.fir.kt deleted file mode 100644 index dca72f74897..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegateToTwoTraits.fir.kt +++ /dev/null @@ -1,15 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo { - fun foo(l: List) -} - -interface Bar { - fun foo(l: List) -} - -class Baz(f: Foo, b: Bar) : - Foo by f, - Bar by b { -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegateToTwoTraits.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegateToTwoTraits.kt index a1a64d4bfa1..b44d4faf981 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegateToTwoTraits.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegateToTwoTraits.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER interface Foo { @@ -9,7 +9,7 @@ interface Bar { fun foo(l: List) } -class Baz(f: Foo, b: Bar) : +class Baz(f: Foo, b: Bar) : Foo by f, Bar by b { -} +} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationAndOwnMethod.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationAndOwnMethod.fir.kt deleted file mode 100644 index e977b88326b..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationAndOwnMethod.fir.kt +++ /dev/null @@ -1,10 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo { - fun foo(l: List) -} - -class Bar(f: Foo): Foo by f { - fun foo(l: List) {} -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt index 7d8d245e6d2..fefb64c5c86 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt @@ -1,10 +1,10 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER interface Foo { fun foo(l: List) } -class Bar(f: Foo): Foo by f { - fun foo(l: List) {} -} +class Bar(f: Foo): Foo by f { + fun foo(l: List) {} +} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.fir.kt deleted file mode 100644 index 6e6ca4dcbf4..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.fir.kt +++ /dev/null @@ -1,16 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo { - fun foo(l: List) { - - } -} - -class Bar(f: Foo): Foo by f { - fun foo(l: List) {} -} - -class BarOther(f: Foo): Foo by f { - override fun foo(l: List) {} -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt index e614ea4d334..156115656c0 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER interface Foo { @@ -7,9 +7,9 @@ interface Foo { } } -class Bar(f: Foo): Foo by f { - fun foo(l: List) {} -} +class Bar(f: Foo): Foo by f { + fun foo(l: List) {} +} class BarOther(f: Foo): Foo by f { override fun foo(l: List) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/extensionProperties.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/extensionProperties.fir.kt index 81a5d0ff7da..287fcae9445 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/extensionProperties.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/extensionProperties.fir.kt @@ -1,9 +1,7 @@ -// COMPARE_WITH_LIGHT_TREE - class G -val G.foo: Int +val G.foo: Int get() = 1 -val G.foo: Int +val G.foo: Int get() = 1 diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/extensionProperties.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/extensionProperties.kt index 0c0855d555f..47b41f4d225 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/extensionProperties.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/extensionProperties.kt @@ -1,9 +1,7 @@ -// COMPARE_WITH_LIGHT_TREE - class G val G.foo: Int - get() = 1 + get() = 1 val G.foo: Int - get() = 1 + get() = 1 diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/genericType.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/genericType.fir.kt deleted file mode 100644 index 13ff5b8a89c..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/genericType.fir.kt +++ /dev/null @@ -1,7 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -class G - -fun foo(x: G): G {null!!} -fun foo(x: G): G {null!!} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/genericType.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/genericType.kt index 02f0ca6ced2..f0a2838df5e 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/genericType.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/genericType.kt @@ -1,7 +1,7 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER class G -fun foo(x: G): G {null!!} -fun foo(x: G): G {null!!} +fun foo(x: G): G {null!!} +fun foo(x: G): G {null!!} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits.fir.kt deleted file mode 100644 index 2866e1d52f0..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits.fir.kt +++ /dev/null @@ -1,13 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo { - fun foo(l: List) {} -} - -interface Bar { - fun foo(l: List) {} -} - -class Baz(): Foo, Bar { -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt index 8e8ad40a0f8..7120a4e7498 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER interface Foo { @@ -9,5 +9,5 @@ interface Bar { fun foo(l: List) {} } -class Baz(): Foo, Bar { -} +class Baz(): Foo, Bar { +} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/kotlinAndJavaCollections.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/kotlinAndJavaCollections.fir.kt deleted file mode 100644 index 4ce45644d4e..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/kotlinAndJavaCollections.fir.kt +++ /dev/null @@ -1,5 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER -PLATFORM_CLASS_MAPPED_TO_KOTLIN - -fun foo(s: List) {} -fun foo(s: java.util.List) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt index cf4528d8232..588520fc22e 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt @@ -1,5 +1,5 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -PLATFORM_CLASS_MAPPED_TO_KOTLIN -fun foo(s: List) {} -fun foo(s: java.util.List) {} +fun foo(s: List) {} +fun foo(s: java.util.List) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/nullableType.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/nullableType.fir.kt deleted file mode 100644 index d0c372cdf24..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/nullableType.fir.kt +++ /dev/null @@ -1,5 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -fun foo(x: String) {} -fun foo(x: String?) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/nullableType.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/nullableType.kt index f031e6de924..63dd382bf7e 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/nullableType.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/nullableType.kt @@ -1,5 +1,5 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -fun foo(x: String) {} -fun foo(x: String?) {} +fun foo(x: String) {} +fun foo(x: String?) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.fir.kt deleted file mode 100644 index 09d50bb6039..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.fir.kt +++ /dev/null @@ -1,14 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface A { - fun foo(l: List) -} - -interface B { - fun foo(l: List) {} -} - -class C(f: A): A by f, B - -class D(f: A): A by f, B diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt index 9feb89aa717..c483559f798 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER interface A { @@ -9,6 +9,6 @@ interface B { fun foo(l: List) {} } -class C(f: A): A by f, B +class C(f: A): A by f, B class D(f: A): A by f, B diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.fir.kt deleted file mode 100644 index 56b1fdc38d4..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.fir.kt +++ /dev/null @@ -1,14 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo { - fun foo(l: List) {} -} - -interface Bar { - fun foo(l: List) {} -} - -class Baz(): Foo, Bar { - 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 7eb777a90cd..87a2cb0e094 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER interface Foo { @@ -10,5 +10,5 @@ interface Bar { } class Baz(): Foo, Bar { - fun foo(l: List) {} + fun foo(l: List) {} } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeMappedToJava.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeMappedToJava.fir.kt deleted file mode 100644 index c358e0f1d0d..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeMappedToJava.fir.kt +++ /dev/null @@ -1,5 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER -PLATFORM_CLASS_MAPPED_TO_KOTLIN - -fun foo(s: java.lang.String) {} -fun foo(s: String) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeMappedToJava.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeMappedToJava.kt index 71898e33cc1..0f1e44e8a6a 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeMappedToJava.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeMappedToJava.kt @@ -1,5 +1,5 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -PLATFORM_CLASS_MAPPED_TO_KOTLIN -fun foo(s: java.lang.String) {} -fun foo(s: String) {} +fun foo(s: java.lang.String) {} +fun foo(s: String) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameter.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameter.fir.kt deleted file mode 100644 index b8a73370ae8..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameter.fir.kt +++ /dev/null @@ -1,5 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -fun foo(x: T): T {null!!} -fun foo(x: Any): Any {null!!} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameter.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameter.kt index 7714caacae0..9eb1a9b0205 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameter.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameter.kt @@ -1,5 +1,5 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -fun foo(x: T): T {null!!} -fun foo(x: Any): Any {null!!} +fun foo(x: T): T {null!!} +fun foo(x: Any): Any {null!!} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithBound.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithBound.fir.kt deleted file mode 100644 index 22c3a4dff84..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithBound.fir.kt +++ /dev/null @@ -1,7 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo - -fun foo(x: T): T {null!!} -fun foo(x: Foo): Foo {null!!} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithBound.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithBound.kt index a227b18c0f7..910199b5096 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithBound.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithBound.kt @@ -1,7 +1,7 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER interface Foo -fun foo(x: T): T {null!!} -fun foo(x: Foo): Foo {null!!} +fun foo(x: T): T {null!!} +fun foo(x: Foo): Foo {null!!} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.fir.kt deleted file mode 100644 index c8419174236..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.fir.kt +++ /dev/null @@ -1,9 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo -interface Bar - -fun foo(x: T): T where T: Foo, T: Bar {null!!} -fun foo(x: Foo): Foo {null!!} -fun foo(x: Bar): Bar {null!!} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt index 84875b046fb..acbf18c3422 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt @@ -1,9 +1,9 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER interface Foo interface Bar -fun foo(x: T): T where T: Foo, T: Bar {null!!} -fun foo(x: Foo): Foo {null!!} +fun foo(x: T): T where T: Foo, T: Bar {null!!} +fun foo(x: Foo): Foo {null!!} fun foo(x: Bar): Bar {null!!} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.fir.kt deleted file mode 100644 index c8419174236..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.fir.kt +++ /dev/null @@ -1,9 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -interface Foo -interface Bar - -fun foo(x: T): T where T: Foo, T: Bar {null!!} -fun foo(x: Foo): Foo {null!!} -fun foo(x: Bar): Bar {null!!} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt index 84875b046fb..acbf18c3422 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt @@ -1,9 +1,9 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER interface Foo interface Bar -fun foo(x: T): T where T: Foo, T: Bar {null!!} -fun foo(x: Foo): Foo {null!!} +fun foo(x: T): T where T: Foo, T: Bar {null!!} +fun foo(x: Foo): Foo {null!!} fun foo(x: Bar): Bar {null!!} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.fir.kt index 1bf8a848b25..e30ce2cc601 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.fir.kt @@ -1,8 +1,6 @@ -// COMPARE_WITH_LIGHT_TREE - enum class E { ENTRY; fun getDeclaringClass() {} - fun finalize() {} + fun finalize() {} } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt index b821dfd0402..d333d24e91d 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt @@ -1,5 +1,3 @@ -// COMPARE_WITH_LIGHT_TREE - enum class E { ENTRY; diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.fir.kt deleted file mode 100644 index 97d0a8fe932..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.fir.kt +++ /dev/null @@ -1,20 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -// KT-7174 Report error on members with the same signature as non-overridable methods from mapped Java types (like Object.wait/notify) - -class A { - fun notify() {} - fun notifyAll() {} - fun wait() {} - fun wait(l: Long) {} - fun wait(l: Long, i: Int) {} - fun getClass(): Class = null!! -} - -fun notify() {} -fun notifyAll() {} -fun wait() {} -fun wait(l: Long) {} -fun wait(l: Long, i: Int) {} -fun getClass(): Class = null!! diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt index 618f6a49c9b..0bb0f5ebc88 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass.kt @@ -1,20 +1,20 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER // KT-7174 Report error on members with the same signature as non-overridable methods from mapped Java types (like Object.wait/notify) class A { - fun notify() {} - fun notifyAll() {} - fun wait() {} - fun wait(l: Long) {} - fun wait(l: Long, i: Int) {} - fun getClass(): Class = null!! + fun notify() {} + fun notifyAll() {} + fun wait() {} + fun wait(l: Long) {} + fun wait(l: Long, i: Int) {} + fun getClass(): Class = null!! } -fun notify() {} -fun notifyAll() {} -fun wait() {} -fun wait(l: Long) {} -fun wait(l: Long, i: Int) {} -fun getClass(): Class = null!! +fun notify() {} +fun notifyAll() {} +fun wait() {} +fun wait(l: Long) {} +fun wait(l: Long, i: Int) {} +fun getClass(): Class = null!! diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/class.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/class.fir.kt deleted file mode 100644 index f910fc8015d..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/class.fir.kt +++ /dev/null @@ -1,6 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -class C { - val x = 1 - fun getX() = 1 -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/class.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/class.kt index b7851a5a29b..608c318b5fb 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/class.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/class.kt @@ -1,6 +1,6 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL class C { - val x = 1 - fun getX() = 1 + val x = 1 + fun getX() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classObject.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classObject.fir.kt deleted file mode 100644 index b4ae1deb083..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classObject.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -class C { - companion object { - val x = 1 - fun getX() = 1 - } -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classObject.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classObject.kt index 12a0346cfcb..85a87d54d91 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classObject.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classObject.kt @@ -1,8 +1,8 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL class C { companion object { - val x = 1 - fun getX() = 1 + val x = 1 + fun getX() = 1 } } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.fir.kt deleted file mode 100644 index 12a067f4e6c..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.fir.kt +++ /dev/null @@ -1,5 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -class C(val x: Int) { - fun getX() = 1 -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.kt index 5e42e2de0de..5bf294bc89c 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.kt @@ -1,5 +1,5 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL class C(val x: Int) { - fun getX() = 1 + fun getX() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.fir.kt deleted file mode 100644 index 300163f7d62..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.fir.kt +++ /dev/null @@ -1,7 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -class C { - fun foo(x: Any) {} - fun Any.foo() {} -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt index fdde1e754c3..466d855bfb5 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt @@ -1,7 +1,7 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER class C { - fun foo(x: Any) {} - fun Any.foo() {} + fun foo(x: Any) {} + fun Any.foo() {} } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.fir.kt index 43d3493efd2..e3813c59e92 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.fir.kt @@ -1,8 +1,7 @@ -// COMPARE_WITH_LIGHT_TREE // !DIAGNOSTICS: -UNUSED_PARAMETER class C { - fun getX(t: Any) = 1 - val Any.x: Int + fun getX(t: Any) = 1 + val Any.x: Int get() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt index d5b677e97ce..eb4b5cb6bd4 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt @@ -1,8 +1,7 @@ -// COMPARE_WITH_LIGHT_TREE // !DIAGNOSTICS: -UNUSED_PARAMETER class C { - fun getX(t: Any) = 1 + fun getX(t: Any) = 1 val Any.x: Int - get() = 1 + get() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndSetter.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndSetter.fir.kt deleted file mode 100644 index c48c59f5342..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndSetter.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -class C { - fun setX(x: Int) {} - - var x: Int = 1 -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt index dfdf7828781..7f8dd3c01bc 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt @@ -1,8 +1,8 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER class C { - fun setX(x: Int) {} + fun setX(x: Int) {} - var x: Int = 1 + var x: Int = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndVar.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndVar.fir.kt index fc236e55c5b..09a44f18ec2 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndVar.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndVar.fir.kt @@ -1,9 +1,8 @@ -// COMPARE_WITH_LIGHT_TREE // !DIAGNOSTICS: -UNUSED_PARAMETER class C { - fun setX(x: Int) {} + fun setX(x: Int) {} - var x: Int = 1 + var x: Int = 1 set(v) {} } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndVar.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndVar.kt index 9ba7b1364cb..e796a47c741 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndVar.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/functionAndVar.kt @@ -1,9 +1,8 @@ -// COMPARE_WITH_LIGHT_TREE // !DIAGNOSTICS: -UNUSED_PARAMETER class C { - fun setX(x: Int) {} + fun setX(x: Int) {} var x: Int = 1 - set(v) {} + set(v) {} } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClass.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClass.fir.kt deleted file mode 100644 index dfeef0e6df2..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClass.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -fun foo() { - class C { - val x = 1 - fun getX() = 1 - } -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClass.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClass.kt index 86446a92eb5..8c8df20942a 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClass.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClass.kt @@ -1,8 +1,8 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL fun foo() { class C { - val x = 1 - fun getX() = 1 + val x = 1 + fun getX() = 1 } } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClassInClass.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClassInClass.fir.kt deleted file mode 100644 index 0481b75a5c9..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClassInClass.fir.kt +++ /dev/null @@ -1,10 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -class Outer { - fun foo() { - class C { - val x = 1 - fun getX() = 1 - } - } -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClassInClass.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClassInClass.kt index 1da3f3e405e..fe187f0c53a 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClassInClass.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/localClassInClass.kt @@ -1,10 +1,10 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL class Outer { fun foo() { class C { - val x = 1 - fun getX() = 1 + val x = 1 + fun getX() = 1 } } } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/nestedClass.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/nestedClass.fir.kt deleted file mode 100644 index 628ee11bbdc..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/nestedClass.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -class B { - class C { - val x = 1 - fun getX() = 1 - } -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/nestedClass.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/nestedClass.kt index 5c40331bd80..1fc4e586e90 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/nestedClass.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/nestedClass.kt @@ -1,8 +1,8 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL class B { class C { - val x = 1 - fun getX() = 1 + val x = 1 + fun getX() = 1 } } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/object.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/object.fir.kt deleted file mode 100644 index 518f64c69c9..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/object.fir.kt +++ /dev/null @@ -1,6 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -object C { - val x = 1 - fun getX() = 1 -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/object.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/object.kt index f8cd431bd28..625a4577b2c 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/object.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/object.kt @@ -1,6 +1,6 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL object C { - val x = 1 - fun getX() = 1 + val x = 1 + fun getX() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpression.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpression.fir.kt deleted file mode 100644 index 0f23dd0221f..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpression.fir.kt +++ /dev/null @@ -1,7 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -fun foo() = - object { - val x = 1 - fun getX() = 1 - } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpression.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpression.kt index 0297d13d633..cbf43b4725c 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpression.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpression.kt @@ -1,7 +1,7 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL fun foo() = object { - val x = 1 - fun getX() = 1 + val x = 1 + fun getX() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.fir.kt deleted file mode 100644 index 2b236d99474..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -class Outer { - val x = object { - val x = 1 - fun getX() = 1 - } -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt index 69133f37b33..1ce83acb14f 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt @@ -1,8 +1,8 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL class Outer { val x = object { - val x = 1 - fun getX() = 1 + val x = 1 + fun getX() = 1 } } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevel.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevel.fir.kt deleted file mode 100644 index 886fecb73a0..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevel.fir.kt +++ /dev/null @@ -1,4 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -val x = 1 -fun getX() = 1 diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevel.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevel.kt index 78102ff892b..ea96a816f84 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevel.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevel.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL -val x = 1 -fun getX() = 1 +val x = 1 +fun getX() = 1 diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevelGetter.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevelGetter.fir.kt index 1b1a26e0242..97fdc83ff2a 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevelGetter.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevelGetter.fir.kt @@ -1,5 +1,3 @@ -// COMPARE_WITH_LIGHT_TREE - -val x: Int +val x: Int get() = 1 -fun getX() = 1 +fun getX() = 1 diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt index 28951b52af4..b6d593ebeeb 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt @@ -1,5 +1,3 @@ -// COMPARE_WITH_LIGHT_TREE - val x: Int - get() = 1 -fun getX() = 1 + get() = 1 +fun getX() = 1 diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.fir.kt index aae05ab0fdc..347fd7a6074 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.fir.kt @@ -1,7 +1,5 @@ -// COMPARE_WITH_LIGHT_TREE - interface T { - val x: Int + val x: Int get() = 1 - fun getX() = 1 + fun getX() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.kt index 45e2438586e..f2c8d1635f5 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait.kt @@ -1,7 +1,5 @@ -// COMPARE_WITH_LIGHT_TREE - interface T { val x: Int - get() = 1 - fun getX() = 1 + get() = 1 + fun getX() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/inlineClasses/declarationClash.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/inlineClasses/declarationClash.fir.kt index 848d48d8029..f2e7d1664c0 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/inlineClasses/declarationClash.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/inlineClasses/declarationClash.fir.kt @@ -1,11 +1,10 @@ -// COMPARE_WITH_LIGHT_TREE // WITH_STDLIB @JvmInline value class A(val x: Int) { - constructor(x: UInt): this(x.toInt()) + constructor(x: UInt): this(x.toInt()) } data class B(val x: UInt) { - constructor(x: Int) : this(x.toUInt()) + constructor(x: Int) : this(x.toUInt()) } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/inlineClasses/declarationClash.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/inlineClasses/declarationClash.kt index d4e21455b72..6a04e4e5e45 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/inlineClasses/declarationClash.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/inlineClasses/declarationClash.kt @@ -1,11 +1,10 @@ -// COMPARE_WITH_LIGHT_TREE // WITH_STDLIB @JvmInline -value class A(val x: Int) { - constructor(x: UInt): this(x.toInt()) -} +value class A(val x: Int) { + constructor(x: UInt): this(x.toInt()) +} -data class B(val x: UInt) { - constructor(x: Int) : this(x.toUInt()) -} +data class B(val x: UInt) { + constructor(x: Int) : this(x.toUInt()) +} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedField.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedField.fir.kt deleted file mode 100644 index 0fda7cf5760..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedField.fir.kt +++ /dev/null @@ -1,10 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -class C { - companion object { - val X = 1 - val `X$1` = 1 - } - - val X = 1 -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedField.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedField.kt index 2122b3ab827..05a02f0ca21 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedField.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedField.kt @@ -1,10 +1,10 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL class C { companion object { val X = 1 - val `X$1` = 1 + val `X$1` = 1 } - val X = 1 + val X = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.fir.kt deleted file mode 100644 index 36a8cf89607..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.fir.kt +++ /dev/null @@ -1,20 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -class B { - companion object A { - } - - val A: A = B.A -} - -class C { - companion object A { - val A: A = C.A - } -} - -class D { - companion object A { - lateinit var A: A - } -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt index 3c3035ff35a..6d01f21372c 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL class B { companion object A { @@ -13,8 +13,8 @@ class C { } } -class D { +class D { companion object A { lateinit var A: A } -} +} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/dataClassCopy.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/dataClassCopy.fir.kt deleted file mode 100644 index 0640a60e87c..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/dataClassCopy.fir.kt +++ /dev/null @@ -1,6 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -data class C(val c: Int) { - fun `copy$default`(c: C, x: Int, m: Int, mh: Any) = C(this.c) -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/dataClassCopy.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/dataClassCopy.kt index 9f1b3881494..dbe83f5520a 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/dataClassCopy.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/dataClassCopy.kt @@ -1,6 +1,6 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -data class C(val c: Int) { - fun `copy$default`(c: C, x: Int, m: Int, mh: Any) = C(this.c) -} +data class C(val c: Int) { + fun `copy$default`(c: C, x: Int, m: Int, mh: Any) = C(this.c) +} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.fir.kt deleted file mode 100644 index 3c61934974e..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.fir.kt +++ /dev/null @@ -1,7 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -class C { - fun `a$default`(c: C, x: Int, m: Int, mh: Any) {} - fun a(x: Int = 1) {} -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.kt index 22b02c02240..fbc2d1ae769 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults.kt @@ -1,7 +1,7 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER class C { - fun `a$default`(c: C, x: Int, m: Int, mh: Any) {} - fun a(x: Int = 1) {} + fun `a$default`(c: C, x: Int, m: Int, mh: Any) {} + fun a(x: Int = 1) {} } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/enum.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/enum.fir.kt deleted file mode 100644 index 2690c61e08b..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/enum.fir.kt +++ /dev/null @@ -1,9 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -enum class E { - A; - - fun values(): Array = null!! - fun valueOf(s: String): E = null!! -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/enum.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/enum.kt index 1d5a85e95af..08382e7f017 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/enum.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/enum.kt @@ -1,9 +1,9 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -enum class E { +enum class E { A; - fun values(): Array = null!! - fun valueOf(s: String): E = null!! -} + fun values(): Array = null!! + fun valueOf(s: String): E = null!! +} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.fir.kt deleted file mode 100644 index e8ddc0dd38b..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.fir.kt +++ /dev/null @@ -1,9 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -object O { - val INSTANCE: O = null!! -} - -object O2 { - lateinit var INSTANCE: O2 -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.kt index 395b2b835e0..b968f40cda1 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance.kt @@ -1,9 +1,9 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL object O { val INSTANCE: O = null!! } -object O2 { +object O2 { lateinit var INSTANCE: O2 -} +} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/jkjk.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/jkjk.kt index b7705e58fd1..f92e1f2ad39 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/jkjk.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/jkjk.kt @@ -21,9 +21,9 @@ public class C extends B { // FILE: K.kt open class K : C() { - fun foo() {} + fun foo() {} fun foo(a: Any) {} - fun bar(i: Int) {} + fun bar(i: Int) {} fun bar(i: String) {} fun baz(i: Int) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt index 2a98cec122b..95b2e1c5dc3 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClass.kt @@ -12,7 +12,7 @@ public class A { open class K : A() { val a = 1 - fun foo() {} + fun foo() {} fun foo(i: Int) {} fun baz(i: Int) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt index 31bf50861c9..1e62600651e 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/statics/kotlinClassExtendsJavaClassExtendsJavaClass.kt @@ -16,9 +16,9 @@ public class B extends A { // FILE: K.kt open class K : B() { - fun foo() {} + fun foo() {} fun foo(a: Any) {} - fun bar(i: Int) {} + fun bar(i: Int) {} fun bar(i: String) {} fun baz(i: Int) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/synthesized/enumValuesValueOf.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/synthesized/enumValuesValueOf.fir.kt deleted file mode 100644 index 8812d76b1ab..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/synthesized/enumValuesValueOf.fir.kt +++ /dev/null @@ -1,14 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -enum class A { - A1, - A2; - - fun valueOf(s: String): A = valueOf(s) - - fun valueOf() = "OK" - - fun values(): Array = null!! - - fun values(x: String) = x -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/synthesized/enumValuesValueOf.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/synthesized/enumValuesValueOf.kt index 7eb5204cc94..fde916caba6 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/synthesized/enumValuesValueOf.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/synthesized/enumValuesValueOf.kt @@ -1,14 +1,14 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL -enum class A { +enum class A { A1, A2; - fun valueOf(s: String): A = valueOf(s) + fun valueOf(s: String): A = valueOf(s) fun valueOf() = "OK" - fun values(): Array = null!! + fun values(): Array = null!! fun values(x: String) = x -} +} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault.fir.kt deleted file mode 100644 index 7d2db136306..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault.fir.kt +++ /dev/null @@ -1,12 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -interface Base1 { - fun getX(): Int -} - -interface Base2 { - val x: Int - get() = 1 -} - -interface Test : Base1, Base2 diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault.kt index 94dd0bd2dc9..6645c7abb10 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL interface Base1 { fun getX(): Int @@ -9,4 +9,4 @@ interface Base2 { get() = 1 } -interface Test : Base1, Base2 +interface Test : Base1, Base2 diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/kt43611.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/kt43611.fir.kt index 60cd47f30b6..ad75d148793 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/kt43611.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/kt43611.fir.kt @@ -1,9 +1,8 @@ -// COMPARE_WITH_LIGHT_TREE // !DIAGNOSTICS: -UNUSED_PARAMETER interface A { - fun f(a: List): String = TODO() - private fun f(a: List): String = TODO() + fun f(a: List): String = TODO() + private fun f(a: List): String = TODO() } class B : A diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/kt43611.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/kt43611.kt index cf32cb23a1c..8d64c7dd67c 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/kt43611.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/kt43611.kt @@ -1,9 +1,8 @@ -// COMPARE_WITH_LIGHT_TREE // !DIAGNOSTICS: -UNUSED_PARAMETER interface A { - fun f(a: List): String = TODO() - private fun f(a: List): String = TODO() + fun f(a: List): String = TODO() + private fun f(a: List): String = TODO() } class B : A diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait.fir.kt deleted file mode 100644 index 436d7a2bf7e..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait.fir.kt +++ /dev/null @@ -1,9 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -interface T { - fun getX() = 1 -} - -class C : T { - val x = 1 -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait.kt index ec09db62f51..b425f2e87a5 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait.kt @@ -1,9 +1,9 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL interface T { fun getX() = 1 } class C : T { - val x = 1 + val x = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.fir.kt index 36be921e368..c3b1106038f 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.fir.kt @@ -1,10 +1,8 @@ -// COMPARE_WITH_LIGHT_TREE - interface T { fun getX() = 1 } interface C : T { - val x: Int + val x: Int get() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt index 87bbee44bc1..03e6458cbc2 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt @@ -1,10 +1,8 @@ -// COMPARE_WITH_LIGHT_TREE - interface T { fun getX() = 1 } interface C : T { val x: Int - get() = 1 + get() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.fir.kt deleted file mode 100644 index 652e53fe999..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.fir.kt +++ /dev/null @@ -1,10 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -interface T { - val x: Int - get() = 1 -} - -interface C : 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 bf530b14477..b03543fd9c6 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL interface T { val x: Int @@ -6,5 +6,5 @@ interface T { } interface C : T { - fun getX() = 1 + fun getX() = 1 } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits.fir.kt deleted file mode 100644 index bcf87c2668a..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits.fir.kt +++ /dev/null @@ -1,13 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -interface T1 { - fun getX() = 1 -} - -interface T2 { - val x: Int - get() = 1 -} - -class C : T1, T2 { -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits.kt index 6494de3df1f..ecfb88890f0 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits.kt @@ -1,4 +1,4 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL interface T1 { fun getX() = 1 @@ -9,5 +9,5 @@ interface T2 { get() = 1 } -class C : T1, T2 { -} +class C : T1, T2 { +} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.fir.kt index b00e9cd8efb..ed799703949 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.fir.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.fir.kt @@ -1,14 +1,13 @@ -// COMPARE_WITH_LIGHT_TREE // !LANGUAGE: +ValueClasses // WITH_STDLIB @JvmInline value class A(val x: Int, val y: Int) { - constructor(other: A): this(other.x, other.y) - constructor(x: UInt, y: UInt): this(x.toInt(), y.toInt()) + constructor(other: A): this(other.x, other.y) + constructor(x: UInt, y: UInt): this(x.toInt(), y.toInt()) } -data class B(val x: UInt, val y: UInt) { - constructor(other: A) : this(other.x, other.y) - constructor(x: Int, y: Int) : this(x.toUInt(), y.toUInt()) +data class B(val x: UInt, val y: UInt) { + constructor(other: A) : this(other.x, other.y) + constructor(x: Int, y: Int) : this(x.toUInt(), y.toUInt()) } diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.kt index 925fb351423..71542e710ed 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.kt @@ -1,14 +1,13 @@ -// COMPARE_WITH_LIGHT_TREE // !LANGUAGE: +ValueClasses // WITH_STDLIB @JvmInline value class A(val x: Int, val y: Int) { - constructor(other: A): this(other.x, other.y) - constructor(x: UInt, y: UInt): this(x.toInt(), y.toInt()) + constructor(other: A): this(other.x, other.y) + constructor(x: UInt, y: UInt): this(x.toInt(), y.toInt()) } -data class B(val x: UInt, val y: UInt) { - constructor(other: A) : this(other.x, other.y) - constructor(x: Int, y: Int) : this(x.toUInt(), y.toUInt()) -} +data class B(val x: UInt, val y: UInt) { + constructor(other: A) : this(other.x, other.y) + constructor(x: Int, y: Int) : this(x.toUInt(), y.toUInt()) +} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/vararg.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/vararg.fir.kt deleted file mode 100644 index bd313ab9e71..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/vararg.fir.kt +++ /dev/null @@ -1,11 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE -// !DIAGNOSTICS: -UNUSED_PARAMETER - -fun foo(vararg x: Int) {} -fun foo(x: IntArray) {} - -fun foo(vararg x: Int?) {} -fun foo(x: Array) {} - -fun foo(vararg nn: Number) {} -fun foo(nn: Array) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/vararg.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/vararg.kt index 5d5c15025f8..5cf97d4f741 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/vararg.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/vararg.kt @@ -1,11 +1,11 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_PARAMETER -fun foo(vararg x: Int) {} -fun foo(x: IntArray) {} +fun foo(vararg x: Int) {} +fun foo(x: IntArray) {} -fun foo(vararg x: Int?) {} -fun foo(x: Array) {} +fun foo(vararg x: Int?) {} +fun foo(x: Array) {} -fun foo(vararg nn: Number) {} -fun foo(nn: Array) {} +fun foo(vararg nn: Number) {} +fun foo(nn: Array) {} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.fir.kt deleted file mode 100644 index 9b5b3cd572d..00000000000 --- a/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.fir.kt +++ /dev/null @@ -1,21 +0,0 @@ -// COMPARE_WITH_LIGHT_TREE - -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, - (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, Int, Int) -> Int -{ - override fun invoke( - p00: Int, p01: Int, p02: Int, p03: Int, p04: Int, p05: Int, p06: Int, p07: Int, p08: Int, p09: Int, - p10: Int, p11: Int, p12: Int, p13: Int, p14: Int, p15: Int, p16: Int, p17: Int, p18: Int, p19: Int, - p20: Int, p21: Int, p22: Int, p23: Int, p24: Int, p25: Int, p26: Int, p27: Int, p28: Int, p29: Int - ): Int = 330 - - override fun invoke( - p00: Int, p01: Int, p02: Int, p03: Int, p04: Int, p05: Int, p06: Int, p07: Int, p08: Int, p09: Int, - p10: Int, p11: Int, p12: Int, p13: Int, p14: Int, p15: Int, p16: Int, p17: Int, p18: Int, p19: Int, - 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 -} diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.kt b/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.kt index 7b4bb559b4f..5a48d455f56 100644 --- a/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.kt @@ -1,6 +1,6 @@ -// COMPARE_WITH_LIGHT_TREE +// FIR_IDENTICAL -class Fun : +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, (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 -} +} diff --git a/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ReplTest.kt b/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ReplTest.kt index bf70004908b..b282a2a5391 100644 --- a/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ReplTest.kt +++ b/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ReplTest.kt @@ -264,13 +264,13 @@ class ReplTest : TestCase() { errorMessage.asErrorDiagnostics( location = SourceCode.Location( SourceCode.Position(2, 1), - SourceCode.Position(2, 6) + SourceCode.Position(2, 10) ) ), errorMessage.asErrorDiagnostics( location = SourceCode.Location( SourceCode.Position(3, 1), - SourceCode.Position(3, 6) + SourceCode.Position(3, 20) ) ) ),