From d0acb3674a85d65e81b7be9d3bb81a33248ede7e Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Fri, 29 Apr 2016 16:29:43 +0300 Subject: [PATCH] Fix rendered testData New members in enum member scope --- .../functions/invoke/onObjects/invokeOnEnum1.txt | 2 ++ .../functions/invoke/onObjects/invokeOnEnum2.txt | 2 ++ .../invoke/onObjects/invokeOnImportedEnum1.txt | 2 ++ .../invoke/onObjects/invokeOnImportedEnum2.txt | 2 ++ .../testData/compileJavaAgainstKotlin/class/kt3561.txt | 2 ++ .../testData/compileJavaAgainstKotlin/class/kt4050.txt | 2 ++ .../enum/DefaultArgumentInEnumConstructor.txt | 2 ++ .../testData/diagnostics/tests/EnumEntryAsType.txt | 4 ++++ compiler/testData/diagnostics/tests/Serializable.txt | 2 ++ .../annotationParameterMustBeConstant/enumConst.txt | 2 ++ .../standaloneInExpression.txt | 2 ++ .../invalidTypesInAnnotationConstructor.txt | 2 ++ .../tests/annotations/options/targets/annotation.txt | 2 ++ .../tests/annotations/options/targets/classifier.txt | 2 ++ .../tests/annotations/options/targets/constructor.txt | 2 ++ .../tests/annotations/options/targets/empty.txt | 2 ++ .../tests/annotations/options/targets/field.txt | 2 ++ .../tests/annotations/options/targets/function.txt | 2 ++ .../tests/annotations/options/targets/incorrect.txt | 2 ++ .../tests/annotations/options/targets/local.txt | 2 ++ .../tests/annotations/options/targets/property.txt | 2 ++ .../tests/annotations/options/targets/type.txt | 2 ++ .../tests/annotations/options/targets/valueparam.txt | 2 ++ .../function/abstractClassConstructors.txt | 2 ++ .../tests/classObjects/InnerClassAccessThroughEnum.txt | 2 ++ .../UninitializedOrReassignedVariables.txt | 2 ++ .../tests/controlFlowAnalysis/kt1185enums.txt | 4 ++++ .../testData/diagnostics/tests/dataClasses/strange.txt | 2 ++ .../declarationChecks/illegalModifiersOnClass.txt | 2 ++ .../diagnostics/tests/declarationChecks/kt1193.txt | 2 ++ .../tests/delegation/DelegationNotTotrait.txt | 4 ++++ .../tests/duplicateJvmSignature/missingNames.txt | 4 ++++ .../tests/duplicateJvmSignature/specialNames/enum.txt | 2 ++ .../synthesized/enumValuesValueOf.txt | 2 ++ .../testData/diagnostics/tests/enum/AbstractEnum.txt | 2 ++ .../testData/diagnostics/tests/enum/AbstractInEnum.txt | 2 ++ .../diagnostics/tests/enum/AbstractOverrideInEnum.txt | 2 ++ .../tests/enum/ConstructorCallFromOutside.txt | 2 ++ .../diagnostics/tests/enum/ExplicitConstructorCall.txt | 2 ++ .../tests/enum/InsideEntryConstructorCall.txt | 2 ++ .../tests/enum/InsideSecondaryConstructorCall.txt | 2 ++ .../tests/enum/SecondaryConstructorCall.txt | 2 ++ .../diagnostics/tests/enum/classObjectInEnum.txt | 2 ++ .../tests/enum/classObjectInEnumPrivate.txt | 2 ++ .../diagnostics/tests/enum/commonSupertype.txt | 4 ++++ .../tests/enum/dontCreatePackageTypeForEnumEntry.txt | 2 ++ .../diagnostics/tests/enum/emptyConstructor.txt | 2 ++ .../diagnostics/tests/enum/entryShouldBeOfEnumType.txt | 2 ++ .../tests/enum/enumEntryCannotHaveClassObject.txt | 2 ++ .../diagnostics/tests/enum/enumEntryInAbstractEnum.txt | 2 ++ .../diagnostics/tests/enum/enumImplementingTrait.txt | 4 ++++ .../diagnostics/tests/enum/enumInheritance.txt | 6 ++++++ .../tests/enum/enumIsAssignableToBuiltInEnum.txt | 2 ++ .../diagnostics/tests/enum/enumMissingName.txt | 2 ++ .../testData/diagnostics/tests/enum/enumModifier.txt | 2 ++ .../testData/diagnostics/tests/enum/enumStarImport.txt | 2 ++ .../tests/enum/enumWithAnnotationKeyword.txt | 2 ++ .../diagnostics/tests/enum/enumWithEmptyName.txt | 2 ++ .../tests/enum/extensionNamedAsEnumEntry.txt | 2 ++ .../testData/diagnostics/tests/enum/ifEnumEntry.txt | 2 ++ .../diagnostics/tests/enum/inheritFromEnumEntry.txt | 4 ++++ .../diagnostics/tests/enum/inheritanceFromEnum.txt | 10 ++++++++++ compiler/testData/diagnostics/tests/enum/inline.txt | 2 ++ .../tests/enum/inner/existingClassObject.txt | 4 ++++ .../diagnostics/tests/enum/inner/insideClass.txt | 2 ++ .../diagnostics/tests/enum/inner/insideClassObject.txt | 2 ++ .../diagnostics/tests/enum/inner/insideEnum.txt | 4 ++++ .../diagnostics/tests/enum/inner/insideEnumEntry.txt | 2 ++ .../tests/enum/inner/insideInnerClassNotAllowed.txt | 2 ++ .../diagnostics/tests/enum/inner/insideObject.txt | 2 ++ .../diagnostics/tests/enum/inner/insideTrait.txt | 2 ++ .../tests/enum/inner/redeclarationInClassObject.txt | 4 ++++ .../testData/diagnostics/tests/enum/inner/twoEnums.txt | 4 ++++ .../enum/inner/twoEnumsInClassObjectAndInnerClass.txt | 4 ++++ .../testData/diagnostics/tests/enum/isEnumEntry.txt | 2 ++ .../diagnostics/tests/enum/javaEnumValueOfMethod.txt | 2 ++ .../diagnostics/tests/enum/javaEnumValuesMethod.txt | 2 ++ .../diagnostics/tests/enum/javaEnumWithAbstractFun.txt | 2 ++ .../diagnostics/tests/enum/javaEnumWithFuns.txt | 2 ++ .../tests/enum/javaEnumWithNameClashing.txt | 2 ++ .../diagnostics/tests/enum/javaEnumWithProperty.txt | 2 ++ compiler/testData/diagnostics/tests/enum/kt2834.txt | 2 ++ .../diagnostics/tests/enum/kt8972_cloneNotAllowed.txt | 2 ++ .../diagnostics/tests/enum/modifiersOnEnumEntry.txt | 2 ++ .../diagnostics/tests/enum/multipleConstructors.txt | 2 ++ .../diagnostics/tests/enum/openMemberInEnum.txt | 2 ++ .../tests/enum/overrideFinalEnumMethods.txt | 2 ++ .../tests/enum/starImportNestedClassAndEntries.txt | 2 ++ .../diagnostics/tests/enum/typeParametersInEnum.txt | 2 ++ .../enum/valuesValueOfAndEntriesAccessibility.txt | 2 ++ .../diagnostics/tests/imports/StarImportFromObject.txt | 2 ++ .../incompleteEnumReference.txt | 2 ++ .../diagnostics/tests/inference/regressions/kt3007.txt | 2 ++ .../diagnostics/tests/inference/regressions/kt3038.txt | 2 ++ .../tests/inline/nonLocalReturns/nestedNonLocals.txt | 2 ++ .../testData/diagnostics/tests/inner/enumEntries.txt | 2 ++ .../diagnostics/tests/inner/illegalModifier.txt | 4 ++++ .../inner/nestedClassAccessedViaInstanceReference.txt | 6 ++++++ .../diagnostics/tests/inner/nestedClassNotAllowed.txt | 2 ++ .../tests/inner/qualifiedExpression/enumConstant.txt | 2 ++ .../inner/qualifiedExpression/nestedEnumConstant.txt | 2 ++ .../testData/diagnostics/tests/j+k/enumGetOrdinal.txt | 2 ++ compiler/testData/diagnostics/tests/j+k/kt2619.txt | 2 ++ .../testData/diagnostics/tests/j+k/serializable.txt | 2 ++ .../tests/modifiers/const/applicability.txt | 2 ++ .../diagnostics/tests/modifiers/const/types.txt | 2 ++ .../diagnostics/tests/modifiers/defaultModifier.txt | 2 ++ .../testData/diagnostics/tests/modifiers/protected.txt | 2 ++ .../diagnostics/tests/modifiers/redundantTargets.txt | 2 ++ .../noSenselessNullOnNullableType.txt | 2 ++ .../diagnostics/tests/recovery/namelessMembers.txt | 2 ++ .../tests/recovery/namelessToplevelDeclarations.txt | 2 ++ .../diagnostics/tests/redeclarations/EnumName.txt | 2 ++ ...eclarationForEnumEntriesAndDefaultObjectMembers.txt | 2 ++ .../redeclarations/SingletonAndFunctionSameName.txt | 2 ++ .../diagnostics/tests/redeclarations/kt2418.txt | 8 ++++++++ .../diagnostics/tests/regressions/Jet183-1.txt | 2 ++ .../testData/diagnostics/tests/regressions/Jet183.txt | 2 ++ .../testData/diagnostics/tests/regressions/ea69735.txt | 2 ++ .../testData/diagnostics/tests/regressions/kt4693.txt | 2 ++ .../diagnostics/tests/resolve/invoke/KT-4372.txt | 2 ++ .../tests/resolve/invoke/kt4321InvokeOnEnum.txt | 4 ++++ .../overloadConflicts/varargsWithRecursiveGenerics.txt | 2 ++ .../diagnostics/tests/resolve/priority/kt9965.txt | 2 ++ .../testData/diagnostics/tests/sealed/NeverEnum.txt | 4 ++++ .../secondaryConstructors/constructorInObject.txt | 2 ++ .../diagnostics/tests/secondaryConstructors/enums.txt | 8 ++++++++ .../tests/subtyping/unresolvedSupertype.txt | 2 ++ .../typeParameters/cannotHaveManyClassUpperBounds.txt | 2 ++ .../diagnostics/tests/when/BranchFalseBypass.txt | 2 ++ .../diagnostics/tests/when/DuplicatedLabels.txt | 2 ++ .../diagnostics/tests/when/ElseOnNullableEnum.txt | 2 ++ .../tests/when/ElseOnNullableEnumWithSmartCast.txt | 2 ++ .../tests/when/EmptyConditionWithExpressionEnum.txt | 2 ++ .../diagnostics/tests/when/ExhaustiveBreakContinue.txt | 2 ++ .../diagnostics/tests/when/ExhaustiveEnumIs.txt | 2 ++ .../diagnostics/tests/when/ExhaustiveEnumMixed.txt | 2 ++ .../tests/when/ExhaustiveInitialization.txt | 2 ++ .../diagnostics/tests/when/ExhaustiveNullable.txt | 2 ++ .../diagnostics/tests/when/ExhaustivePlatformEnum.txt | 2 ++ .../tests/when/ExhaustivePlatformEnumAnnotated.txt | 2 ++ .../tests/when/ExhaustivePlatformEnumElse.txt | 2 ++ .../tests/when/ExhaustivePlatformEnumNull.txt | 2 ++ .../tests/when/ExhaustivePlatformEnumStatement.txt | 2 ++ .../diagnostics/tests/when/ExhaustiveReturn.txt | 2 ++ .../diagnostics/tests/when/ExhaustiveReturnThrow.txt | 2 ++ .../tests/when/ExhaustiveWithNullabilityCheck.txt | 2 ++ .../when/ExhaustiveWithNullabilityCheckBefore.txt | 2 ++ .../tests/when/ExhaustiveWithNullabilityCheckElse.txt | 2 ++ .../tests/when/NonExhaustivePlatformEnum.txt | 2 ++ .../diagnostics/tests/when/NonExhaustiveWarning.txt | 2 ++ .../tests/when/NonExhaustiveWarningElse.txt | 2 ++ .../tests/when/NonExhaustiveWarningFalse.txt | 2 ++ .../tests/when/NonExhaustiveWarningNull.txt | 2 ++ .../tests/when/NonExhaustiveWithNullabilityCheck.txt | 2 ++ .../diagnostics/tests/when/PropertyNotInitialized.txt | 2 ++ .../testsWithStdLib/javaClassOnCompanion.txt | 2 ++ .../compiledJava/annotations/AnnotatedEnumEntry.txt | 2 ++ .../compiledJava/annotations/CustomAnnotation.txt | 2 ++ .../annotations/EnumArgumentWithCustomToString.txt | 2 ++ .../annotations/EnumConstructorParameter.txt | 2 ++ .../compiledJava/annotations/NestedEnumArgument.txt | 2 ++ .../loadJava/compiledJava/enum/EnumMembers.txt | 2 ++ .../compiledJava/enum/EnumWithSpecializedEntry.txt | 2 ++ .../testData/loadJava/compiledJava/enum/JavaEnum.txt | 2 ++ .../testData/loadJava/compiledJava/static/Enum.txt | 2 ++ .../compiledJava/static/StaticMembersInEnum.txt | 2 ++ .../static/StaticMembersInEnumFromParents.txt | 2 ++ .../annotations/AnnotationInAnnotationArguments.txt | 2 ++ .../annotations/EnumArgumentWithCustomToString.txt | 2 ++ .../annotations/classMembers/EnumEntry.txt | 2 ++ .../annotations/parameters/EnumConstructor.txt | 2 ++ .../class/EnumWithGenericConstructorParameter.txt | 2 ++ .../class/EnumWithPrimitiveConstructorParameter.txt | 2 ++ .../loadJava/compiledKotlin/enum/enumVisibility.txt | 6 ++++++ .../compiledKotlin/enum/enumWithConstuctor.txt | 2 ++ .../compiledKotlin/enum/enumWithInnerClasses.txt | 2 ++ .../loadJava/compiledKotlin/enum/innerEnum.txt | 2 ++ .../enum/innerEnumExistingClassObject.txt | 2 ++ .../loadJava/compiledKotlin/enum/simpleEnum.txt | 2 ++ .../loadJava/compiledKotlin/fromLoadJava/enum.txt | 2 ++ .../compiledKotlin/memberOrder/enumEntries.txt | 2 ++ .../fileStructure/InheritedMembersOfEnum.after | 2 ++ 183 files changed, 428 insertions(+) diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt index 4cf0070e2f8..98f250eefb7 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt @@ -13,6 +13,8 @@ public final enum class A : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public final operator fun invoke(/*0*/ i: kotlin.Int): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt index 8faecc09d1a..0547a5bfbde 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt @@ -14,6 +14,8 @@ public final enum class A : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt index 4cf0070e2f8..98f250eefb7 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt @@ -13,6 +13,8 @@ public final enum class A : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public final operator fun invoke(/*0*/ i: kotlin.Int): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt index 8faecc09d1a..0547a5bfbde 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt @@ -14,6 +14,8 @@ public final enum class A : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt b/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt index ba7d174ff53..e165addb1b7 100644 --- a/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt +++ b/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt @@ -8,6 +8,8 @@ public final enum class MyEnum : kotlin.Enum { public final /*fake_override*/ val ordinal: kotlin.Int protected final /*fake_override*/ fun clone(): kotlin.Any public final /*fake_override*/ fun compareTo(/*0*/ test.MyEnum): kotlin.Int + protected/*protected and package*/ final /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ kotlin.String): test.MyEnum diff --git a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt index 5bdbb5773b8..a93049f6353 100644 --- a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt +++ b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt @@ -14,6 +14,8 @@ public final enum class MyEnum : kotlin.Enum { protected final /*fake_override*/ fun clone(): kotlin.Any public final /*fake_override*/ fun compareTo(/*0*/ test.MyEnum): kotlin.Int public final fun f(/*0*/ @java.lang.Deprecated() kotlin.Int): kotlin.Unit + protected/*protected and package*/ final /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ kotlin.String): test.MyEnum diff --git a/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt b/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt index 987951c02b5..ab71a31880c 100644 --- a/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt +++ b/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt @@ -16,6 +16,8 @@ public final enum class K : kotlin.Enum { public final /*fake_override*/ val ordinal: kotlin.Int protected final /*fake_override*/ fun clone(): kotlin.Any public final /*fake_override*/ fun compareTo(/*0*/ test.K): kotlin.Int + protected/*protected and package*/ final /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ kotlin.String): test.K diff --git a/compiler/testData/diagnostics/tests/EnumEntryAsType.txt b/compiler/testData/diagnostics/tests/EnumEntryAsType.txt index fa34bf3c7ad..53cf54e548a 100644 --- a/compiler/testData/diagnostics/tests/EnumEntryAsType.txt +++ b/compiler/testData/diagnostics/tests/EnumEntryAsType.txt @@ -12,6 +12,8 @@ public final enum class Color : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Color): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -37,7 +39,9 @@ public final class MyColor : Color.RED { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Color): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit public final fun foo(/*0*/ arg: Color.RED): Color.RED + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/Serializable.txt b/compiler/testData/diagnostics/tests/Serializable.txt index 81eea40318c..98395d6beb7 100644 --- a/compiler/testData/diagnostics/tests/Serializable.txt +++ b/compiler/testData/diagnostics/tests/Serializable.txt @@ -20,6 +20,8 @@ public final enum class C : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: C): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt index 2f478ee623d..5a0b4e8ac61 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt @@ -19,6 +19,8 @@ public final enum class MyEnum : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/standaloneInExpression.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/standaloneInExpression.txt index 3289652bd7d..531c9158276 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/standaloneInExpression.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/standaloneInExpression.txt @@ -17,6 +17,8 @@ public final enum class MyEnum : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt index 6f812071813..758f439c0bf 100644 --- a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt +++ b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt @@ -193,6 +193,8 @@ package test { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt index 903fd952505..6a6a8bf7df8 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt @@ -14,6 +14,8 @@ package protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt index 16cd209f599..7007711393c 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt @@ -14,6 +14,8 @@ package protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt index aa5f698f514..41f1139d1ed 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt @@ -14,6 +14,8 @@ package protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt index 5d87b9a259c..485b456595c 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt @@ -14,6 +14,8 @@ package protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/field.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/field.txt index f33fc617b93..1e442545e42 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/field.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/field.txt @@ -47,6 +47,8 @@ public final enum class Your : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Your): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt index ded50db8424..49c5f08887e 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt @@ -14,6 +14,8 @@ package protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt index 4d4ff0b1788..664d744f313 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt @@ -14,6 +14,8 @@ package protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt index 7dbbc030284..a7b125a4135 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt @@ -14,6 +14,8 @@ package protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt index 21bbaaa88df..f31d18613e1 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt @@ -14,6 +14,8 @@ package protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt index b280d1c273d..d9e496782d2 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt @@ -14,6 +14,8 @@ package protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt index ea92a96f66c..972bb66cf34 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt @@ -14,6 +14,8 @@ package protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt b/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt index 726d607828a..98540b8ce87 100644 --- a/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt +++ b/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt @@ -29,6 +29,8 @@ public final enum class D : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: D): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt index 54bc5263560..b1980ed4e66 100644 --- a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt +++ b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt @@ -18,6 +18,8 @@ package a { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.C): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt index 55fc31295e6..6622ab09ddb 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt @@ -127,6 +127,8 @@ package uninitialized_reassigned_variables { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: uninitialized_reassigned_variables.ProtocolState): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract fun signal(): uninitialized_reassigned_variables.ProtocolState public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt index ec6c11e5ef0..894e6757d99 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt @@ -34,6 +34,8 @@ package kt1185 { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1185.Color): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -57,6 +59,8 @@ package kt1185 { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1185.Direction): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/dataClasses/strange.txt b/compiler/testData/diagnostics/tests/dataClasses/strange.txt index 78571c49c9a..ec6dbdffbeb 100644 --- a/compiler/testData/diagnostics/tests/dataClasses/strange.txt +++ b/compiler/testData/diagnostics/tests/dataClasses/strange.txt @@ -14,6 +14,8 @@ public final data enum class First : kotlin.Enum { public final operator /*synthesized*/ fun component1(): kotlin.Int public final /*synthesized*/ fun copy(/*0*/ x: kotlin.Int = ...): First public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt index e1aee0a8477..893e880eecf 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt +++ b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt @@ -70,6 +70,8 @@ public open enum class C : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: C): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt index e4709725130..68100bfae99 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt +++ b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt @@ -22,6 +22,8 @@ package kt1193 { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1193.MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt b/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt index 79375276714..64c0315bf7d 100644 --- a/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt +++ b/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt @@ -23,6 +23,8 @@ public open enum class EN : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EN): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -51,6 +53,8 @@ public final class Test2 : EN { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EN): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt index a3dfde1451c..3e82ccc2015 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt @@ -25,6 +25,8 @@ public final enum class : kotlin.Enum<> { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<!>! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -75,6 +77,8 @@ public final class Outer { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Outer.): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class!>! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt index 7cce4e39ca5..d3f501160a0 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt @@ -9,6 +9,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public final fun valueOf(/*0*/ s: kotlin.String): E diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt index 4bc6c26f63b..8121bc84c33 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt @@ -11,6 +11,8 @@ public final enum class A : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public final fun valueOf(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt b/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt index 12ba8bd202e..a0d4d08af16 100644 --- a/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt @@ -9,6 +9,8 @@ package abstract { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: abstract.MyAbstractEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt index 058c17dd481..6ded81821f7 100644 --- a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt @@ -37,7 +37,9 @@ package abstract { public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: abstract.MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final fun f(): kotlin.Unit + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit public final fun g(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public abstract fun h(): kotlin.Unit public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract fun j(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt b/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt index d12f7b7a871..c182e1c2db7 100644 --- a/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt @@ -10,6 +10,8 @@ public final enum class E : kotlin.Enum, T { public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ fun f(): kotlin.Unit + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt b/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt index 65b3097df62..da23d474229 100644 --- a/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt +++ b/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt @@ -14,6 +14,8 @@ public final enum class A : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt index 72e8e6e3d20..978fb0ffbcd 100644 --- a/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt +++ b/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt @@ -13,6 +13,8 @@ public final enum class A : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final fun createA(): A public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt index a8aa5c97690..b43f32c2d2f 100644 --- a/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt +++ b/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt @@ -12,6 +12,8 @@ public final enum class A : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract fun selfOrFriend(): A public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt index 2d9d7d8e514..06d80f5b40c 100644 --- a/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt +++ b/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt @@ -18,6 +18,8 @@ public final enum class A : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt index 07ec3b2bfe0..5abfbf2b566 100644 --- a/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt +++ b/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt @@ -17,6 +17,8 @@ public final enum class A : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt index d8b55bc0116..3e8b5947f25 100644 --- a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt @@ -11,6 +11,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt index 03937e1362e..9f76ce77406 100644 --- a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt +++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt @@ -14,6 +14,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/commonSupertype.txt b/compiler/testData/diagnostics/tests/enum/commonSupertype.txt index 3b354017bf0..798e50bfc20 100644 --- a/compiler/testData/diagnostics/tests/enum/commonSupertype.txt +++ b/compiler/testData/diagnostics/tests/enum/commonSupertype.txt @@ -11,6 +11,8 @@ public final enum class A : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -28,6 +30,8 @@ public final enum class B : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt index 5d0de810905..49b2833c444 100644 --- a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt +++ b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt @@ -18,6 +18,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt b/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt index 12b57e2651e..5fb7286f10b 100644 --- a/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt +++ b/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt @@ -9,6 +9,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt b/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt index 1849b02fe41..48bebe61e49 100644 --- a/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt +++ b/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt @@ -13,6 +13,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt index 7ab3a6043a0..0acedf39b07 100644 --- a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt +++ b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt @@ -13,6 +13,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt b/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt index 9465d54c810..e39133b4078 100644 --- a/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt @@ -12,7 +12,9 @@ public final enum class EnumClass : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumClass): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit public abstract fun foo(): kotlin.Int + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt b/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt index 6672d2b4d24..4f128262b1f 100644 --- a/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt +++ b/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt @@ -11,7 +11,9 @@ public final enum class EnumImplementingTraitWithFun : kotlin.Enum! public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String @@ -32,6 +34,8 @@ public final enum class EnumImplementingTraitWithVal : kotlin.Enum! public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/enumInheritance.txt b/compiler/testData/diagnostics/tests/enum/enumInheritance.txt index 7c36b4103e5..12cdf3a3d0f 100644 --- a/compiler/testData/diagnostics/tests/enum/enumInheritance.txt +++ b/compiler/testData/diagnostics/tests/enum/enumInheritance.txt @@ -25,6 +25,8 @@ public final enum class MyEnum2 : kotlin.Enum, MyTrait { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum2): kotlin.Int public final override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String @@ -40,6 +42,8 @@ public final enum class MyEnum3 : MyEnumBase { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnumBase): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -55,6 +59,8 @@ public final enum class MyEnumBase : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnumBase): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt b/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt index dc5e099097c..1f305b7cb3d 100644 --- a/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt @@ -13,6 +13,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/enumMissingName.txt b/compiler/testData/diagnostics/tests/enum/enumMissingName.txt index bb301566fba..817059e0b2f 100644 --- a/compiler/testData/diagnostics/tests/enum/enumMissingName.txt +++ b/compiler/testData/diagnostics/tests/enum/enumMissingName.txt @@ -14,6 +14,8 @@ public final enum class : kotlin.Enum<> { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<!>! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/enumModifier.txt b/compiler/testData/diagnostics/tests/enum/enumModifier.txt index 804e3366c73..14ae4352e40 100644 --- a/compiler/testData/diagnostics/tests/enum/enumModifier.txt +++ b/compiler/testData/diagnostics/tests/enum/enumModifier.txt @@ -25,6 +25,8 @@ public final enum class B : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/enumStarImport.txt b/compiler/testData/diagnostics/tests/enum/enumStarImport.txt index 9be2416bdde..da0633ada4d 100644 --- a/compiler/testData/diagnostics/tests/enum/enumStarImport.txt +++ b/compiler/testData/diagnostics/tests/enum/enumStarImport.txt @@ -15,6 +15,8 @@ package enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: enum.HappyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt b/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt index d69a6d0d25b..df06cd3d9a9 100644 --- a/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt +++ b/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt @@ -9,6 +9,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt b/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt index 5f8c7424aa2..5a7f1a967ca 100644 --- a/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt +++ b/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt @@ -7,6 +7,8 @@ public final enum class : kotlin.Enum<> { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<!>! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt index 421841a26ed..17ba2deb494 100644 --- a/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt +++ b/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt @@ -13,6 +13,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt index e357dd7e94d..f4a7fc45c85 100644 --- a/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt +++ b/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt @@ -13,6 +13,8 @@ public final enum class MyEnum : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt index 3cfe44652db..6e753a36451 100644 --- a/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt +++ b/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt @@ -7,6 +7,8 @@ public final class A : E.ENTRY { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -20,6 +22,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt index 434144e7061..12e3624fe0b 100644 --- a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt @@ -7,6 +7,8 @@ public final class MyClass : MyEnum2 { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum2): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -18,6 +20,8 @@ public final class MyClass2 : MyJavaEnum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyJavaEnum!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -31,6 +35,8 @@ public open enum class MyEnum : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -46,6 +52,8 @@ public final enum class MyEnum2 : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum2): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -61,6 +69,8 @@ public final enum class MyJavaEnum : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyJavaEnum!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/inline.txt b/compiler/testData/diagnostics/tests/enum/inline.txt index e04d5740ae0..83940dc1497 100644 --- a/compiler/testData/diagnostics/tests/enum/inline.txt +++ b/compiler/testData/diagnostics/tests/enum/inline.txt @@ -9,6 +9,8 @@ public final enum class My : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt index 5b7ace8a9f4..7b12ca76f6f 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt @@ -22,6 +22,8 @@ public final class A { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -53,6 +55,8 @@ public final class B { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt b/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt index e09112b3ff8..3946a598866 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt @@ -15,6 +15,8 @@ public final class A { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt index c7fd717b000..a701eeabe00 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt @@ -21,6 +21,8 @@ public final class A { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt b/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt index 1953f1aa096..e35773d123d 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt @@ -9,6 +9,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -21,6 +23,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E.F): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt index 8d187ea281f..e38f5953a46 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt @@ -9,6 +9,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt b/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt index be3af55fd56..8f07ec499cd 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt @@ -21,6 +21,8 @@ public final class A { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.B.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt b/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt index 081e17d896b..127757bcd91 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt @@ -15,6 +15,8 @@ public object A { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt b/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt index 98e9888590a..df57ca6d9ba 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt @@ -14,6 +14,8 @@ public interface A { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt index f86f8f861fe..8e14e610e05 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt @@ -21,6 +21,8 @@ public final class A { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -39,6 +41,8 @@ public final class A { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt b/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt index 01c14c40352..fbb90ede57d 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt @@ -15,6 +15,8 @@ public final class A { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -32,6 +34,8 @@ public final class A { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.F): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt index f21790a7acb..5a4c54d62f1 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt @@ -21,6 +21,8 @@ public final class A { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.B.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -45,6 +47,8 @@ public final class A { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt index e357dd7e94d..f4a7fc45c85 100644 --- a/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt +++ b/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt @@ -13,6 +13,8 @@ public final enum class MyEnum : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt b/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt index 62b7e5dafd7..6ce8fcbb42f 100644 --- a/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt +++ b/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt @@ -11,6 +11,8 @@ public final enum class A : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt index 0db9dcbb532..ab6e0605fb8 100644 --- a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt +++ b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt @@ -13,6 +13,8 @@ public final enum class A : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt index fe74c453f8b..6aa080a3e4a 100644 --- a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt +++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt @@ -11,6 +11,8 @@ public abstract enum class A : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract fun s(): kotlin.String! public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt index d1fee7722d5..c1e446ab819 100644 --- a/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt +++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt @@ -13,6 +13,8 @@ public final enum class A : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open fun s(): kotlin.String! public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt index 3102cacb914..3423a40f6f3 100644 --- a/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt +++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt @@ -14,6 +14,8 @@ public final enum class A : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt index 2ff4263d128..bb311f01b8e 100644 --- a/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt +++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt @@ -14,6 +14,8 @@ public final enum class A : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/kt2834.txt b/compiler/testData/diagnostics/tests/enum/kt2834.txt index e5dcd0c6526..4ee72c7aa26 100644 --- a/compiler/testData/diagnostics/tests/enum/kt2834.txt +++ b/compiler/testData/diagnostics/tests/enum/kt2834.txt @@ -13,6 +13,8 @@ private final enum class MethodKind : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MethodKind): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt index e4e750b2ff1..d5e57fc5795 100644 --- a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt +++ b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt @@ -9,6 +9,8 @@ public final enum class E : kotlin.Enum, kotlin.Cloneable { protected open override /*2*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt index 710a9efcc6b..5ec773659de 100644 --- a/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt +++ b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt @@ -39,6 +39,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt b/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt index 1ba4825a84d..878b57ecef9 100644 --- a/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt +++ b/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt @@ -17,6 +17,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt b/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt index 62e9b73985b..3652546282f 100644 --- a/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt @@ -14,7 +14,9 @@ public final enum class EnumWithOpenMembers : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumWithOpenMembers): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final fun f(): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit public open fun foo(): kotlin.Int + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt index 9f90a13b581..52c8f28432f 100644 --- a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt +++ b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt @@ -9,6 +9,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public open override /*1*/ fun compareTo(/*0*/ other: E): kotlin.Int public open override /*1*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public open override /*1*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt index 5b2d3676b8a..e881115f059 100644 --- a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt +++ b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt @@ -21,6 +21,8 @@ package foo { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: foo.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt b/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt index 21cb1e6272d..68b386dc10b 100644 --- a/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt @@ -11,6 +11,8 @@ package bug { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: bug.Foo): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class!>! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt index 7d0708369ca..5af132492bd 100644 --- a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt +++ b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt @@ -13,6 +13,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public final fun oof(): E public final fun rab(): kotlin.Array diff --git a/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt b/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt index 1b93bddd681..88aba89e346 100644 --- a/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt +++ b/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt @@ -97,6 +97,8 @@ package a { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt index 0b48fb7de1e..a79bc60aeb6 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt +++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt @@ -15,6 +15,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt index 14087f9056c..c230176214e 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt @@ -19,6 +19,8 @@ package a { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.SomeEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt index 1d68fcd3580..c99539f1b43 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt @@ -16,6 +16,8 @@ package a { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.TestEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt index 6e18d6d016d..7b349a5227a 100644 --- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt +++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt @@ -40,6 +40,8 @@ public final enum class Kind : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Kind): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/inner/enumEntries.txt b/compiler/testData/diagnostics/tests/inner/enumEntries.txt index a926f55374a..e19b104a926 100644 --- a/compiler/testData/diagnostics/tests/inner/enumEntries.txt +++ b/compiler/testData/diagnostics/tests/inner/enumEntries.txt @@ -11,7 +11,9 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit public abstract fun foo(): kotlin.Int + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public final fun outerFun(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/inner/illegalModifier.txt b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt index 40af25725f8..b702ffd8ed6 100644 --- a/compiler/testData/diagnostics/tests/inner/illegalModifier.txt +++ b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt @@ -64,6 +64,8 @@ public final class D { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: D.R): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -91,6 +93,8 @@ public final enum class H : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: H): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt index 4e882f7fde3..10500a6aa21 100644 --- a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt +++ b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt @@ -31,6 +31,8 @@ public object Obj { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Obj.NestedEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -93,6 +95,8 @@ public final class WithClassObject { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: WithClassObject.NestedEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -148,6 +152,8 @@ public final class WithoutClassObject { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: WithoutClassObject.NestedEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt b/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt index 029543be686..da19be04c4d 100644 --- a/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt +++ b/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt @@ -33,6 +33,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt index 1b4100ba0c6..0fe7efc7c62 100644 --- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt +++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt @@ -14,6 +14,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt index abeacc4810a..5cb1d172ab0 100644 --- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt +++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt @@ -20,6 +20,8 @@ public final class A { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/j+k/enumGetOrdinal.txt b/compiler/testData/diagnostics/tests/j+k/enumGetOrdinal.txt index df0b227821f..979d6bd70e8 100644 --- a/compiler/testData/diagnostics/tests/j+k/enumGetOrdinal.txt +++ b/compiler/testData/diagnostics/tests/j+k/enumGetOrdinal.txt @@ -11,6 +11,8 @@ public final enum class MyEnum : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public open fun getOrdinal(): kotlin.Int public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/j+k/kt2619.txt b/compiler/testData/diagnostics/tests/j+k/kt2619.txt index cad38c04195..b678e4d7909 100644 --- a/compiler/testData/diagnostics/tests/j+k/kt2619.txt +++ b/compiler/testData/diagnostics/tests/j+k/kt2619.txt @@ -13,6 +13,8 @@ public final enum class Type : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Type!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/j+k/serializable.txt b/compiler/testData/diagnostics/tests/j+k/serializable.txt index 9c3dfa6b4e9..cecb15122ad 100644 --- a/compiler/testData/diagnostics/tests/j+k/serializable.txt +++ b/compiler/testData/diagnostics/tests/j+k/serializable.txt @@ -18,6 +18,8 @@ public final enum class C : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: C): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt b/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt index 98bccffee17..d51e49c1668 100644 --- a/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt +++ b/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt @@ -78,6 +78,8 @@ public final enum class MyEnum : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/modifiers/const/types.txt b/compiler/testData/diagnostics/tests/modifiers/const/types.txt index a39225e8c19..ff13a8e26cc 100644 --- a/compiler/testData/diagnostics/tests/modifiers/const/types.txt +++ b/compiler/testData/diagnostics/tests/modifiers/const/types.txt @@ -17,6 +17,8 @@ public final enum class MyEnum : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt b/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt index 58f7385c192..5d03e6748e0 100644 --- a/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt +++ b/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt @@ -78,6 +78,8 @@ public final enum class Enum : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Enum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/modifiers/protected.txt b/compiler/testData/diagnostics/tests/modifiers/protected.txt index adb27cd5d72..5f7173f39ec 100644 --- a/compiler/testData/diagnostics/tests/modifiers/protected.txt +++ b/compiler/testData/diagnostics/tests/modifiers/protected.txt @@ -42,6 +42,8 @@ public final enum class Our : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Our): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt b/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt index 9ae29595bcd..bf4cb9b4b0a 100644 --- a/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt +++ b/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt @@ -30,6 +30,8 @@ public final enum class Third : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Third): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt index 3359389a797..461bd432f5f 100644 --- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt +++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt @@ -16,6 +16,8 @@ public/*package*/ open class A { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Empty!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt b/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt index 30c442ba16d..dd71501a2c8 100644 --- a/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt +++ b/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt @@ -22,6 +22,8 @@ public final class C { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: C.): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class!>! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt b/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt index fcdac0cfa2b..4b80fa4057e 100644 --- a/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt +++ b/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt @@ -23,6 +23,8 @@ public final enum class : kotlin.Enum<> { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<!>! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/redeclarations/EnumName.txt b/compiler/testData/diagnostics/tests/redeclarations/EnumName.txt index e772822cb7b..33ef6720770 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/EnumName.txt +++ b/compiler/testData/diagnostics/tests/redeclarations/EnumName.txt @@ -9,6 +9,8 @@ public final enum class A : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt index 5c14406404a..84edefec7da 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt +++ b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt @@ -11,6 +11,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt b/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt index 9d16d6c85b1..4f10183177a 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt +++ b/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt @@ -16,6 +16,8 @@ public final enum class En : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: En): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt b/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt index 87583dca1ae..fdb2b53b233 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt +++ b/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt @@ -13,6 +13,8 @@ package kt2418 { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -31,6 +33,8 @@ package kt2418 { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.B): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -49,6 +53,8 @@ package kt2418 { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.C): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -66,6 +72,8 @@ package kt2418 { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.D): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt b/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt index 4e5acf4e44c..0703b4c0ed2 100644 --- a/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt +++ b/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt @@ -13,6 +13,8 @@ public final enum class ProtocolState : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ProtocolState): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract fun signal(): ProtocolState public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/regressions/Jet183.txt b/compiler/testData/diagnostics/tests/regressions/Jet183.txt index 97261e7a5ae..265037863e8 100644 --- a/compiler/testData/diagnostics/tests/regressions/Jet183.txt +++ b/compiler/testData/diagnostics/tests/regressions/Jet183.txt @@ -13,6 +13,8 @@ public final enum class ProtocolState : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ProtocolState): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract fun signal(): ProtocolState public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/regressions/ea69735.txt b/compiler/testData/diagnostics/tests/regressions/ea69735.txt index 108878d8f15..9f6cf4e9a81 100644 --- a/compiler/testData/diagnostics/tests/regressions/ea69735.txt +++ b/compiler/testData/diagnostics/tests/regressions/ea69735.txt @@ -9,6 +9,8 @@ public final enum class MyEnum : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/regressions/kt4693.txt b/compiler/testData/diagnostics/tests/regressions/kt4693.txt index c316b3605b4..08bc68bf08b 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt4693.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt4693.txt @@ -10,6 +10,8 @@ public final enum class MyEnum : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final inline fun doSmth(/*0*/ f: (MyEnum) -> kotlin.String): kotlin.String public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt b/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt index fea7542e770..cc375f35d03 100644 --- a/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt +++ b/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt @@ -12,6 +12,8 @@ public final enum class EnumClass : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumClass): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt index 71a4013a47e..bcf9c1c1618 100644 --- a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt +++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt @@ -13,6 +13,8 @@ public final enum class DOMElementTestClasses : kotlin.Enum! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public final operator fun invoke(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -38,6 +40,8 @@ public final enum class TestClasses : kotlin.Enum, EnumStyleClass { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: TestClasses): kotlin.Int public final override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun invoke(): kotlin.Unit public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsWithRecursiveGenerics.txt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsWithRecursiveGenerics.txt index da29be6a750..c9b46956ed4 100644 --- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsWithRecursiveGenerics.txt +++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsWithRecursiveGenerics.txt @@ -30,6 +30,8 @@ public final enum class X : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/resolve/priority/kt9965.txt b/compiler/testData/diagnostics/tests/resolve/priority/kt9965.txt index 171900c0a65..41f3304c03b 100644 --- a/compiler/testData/diagnostics/tests/resolve/priority/kt9965.txt +++ b/compiler/testData/diagnostics/tests/resolve/priority/kt9965.txt @@ -11,6 +11,8 @@ public final enum class Foo : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Foo): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt b/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt index 204da9af140..ec2dc1c1f9e 100644 --- a/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt +++ b/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt @@ -11,6 +11,8 @@ public sealed enum class SealedEnum : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: SealedEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -21,6 +23,8 @@ public sealed enum class SealedEnum : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: SealedEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt index e61be41b48b..886780e67d3 100644 --- a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt +++ b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt @@ -19,6 +19,8 @@ public final enum class B : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt index 07fce0b0796..e121a23866e 100644 --- a/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt +++ b/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt @@ -21,6 +21,8 @@ public final enum class A : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -47,6 +49,8 @@ public final enum class B : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -64,6 +68,8 @@ public final enum class C : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: C): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -89,6 +95,8 @@ public final enum class D : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: D): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public abstract fun f(): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt b/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt index cdfe3457b09..c5d0990fb28 100644 --- a/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt +++ b/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt @@ -26,6 +26,8 @@ public final enum class A4 : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A4): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/typeParameters/cannotHaveManyClassUpperBounds.txt b/compiler/testData/diagnostics/tests/typeParameters/cannotHaveManyClassUpperBounds.txt index 210936e4f66..4869d71197b 100644 --- a/compiler/testData/diagnostics/tests/typeParameters/cannotHaveManyClassUpperBounds.txt +++ b/compiler/testData/diagnostics/tests/typeParameters/cannotHaveManyClassUpperBounds.txt @@ -74,6 +74,8 @@ public final enum class E1 : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E1): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt b/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt index 57b789db777..c58186bcafb 100644 --- a/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt +++ b/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt @@ -13,6 +13,8 @@ public final enum class My : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/DuplicatedLabels.txt b/compiler/testData/diagnostics/tests/when/DuplicatedLabels.txt index 2a678a62287..142ee7156a9 100644 --- a/compiler/testData/diagnostics/tests/when/DuplicatedLabels.txt +++ b/compiler/testData/diagnostics/tests/when/DuplicatedLabels.txt @@ -21,6 +21,8 @@ package test { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Color): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt index c2f0e9c6b6f..7c9c46a0d2f 100644 --- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt +++ b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt @@ -17,6 +17,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt index bf2c37a3852..ba9f47929eb 100644 --- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt +++ b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt @@ -13,6 +13,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt b/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt index d418e446762..04fc2aa7e43 100644 --- a/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt +++ b/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt @@ -13,6 +13,8 @@ public final enum class My : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.txt index 7ff9d2ce1db..a76e1f11d8b 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.txt @@ -15,6 +15,8 @@ public final enum class Color : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Color): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt index 1661d468153..8205890d230 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt @@ -15,6 +15,8 @@ public final enum class MyEnum : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt index 1661d468153..8205890d230 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt @@ -15,6 +15,8 @@ public final enum class MyEnum : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt index 3be5416bbcd..2df30b91057 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt @@ -17,6 +17,8 @@ public final enum class Direction : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Direction): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt index c661c3221ae..041c6cbe95e 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt @@ -13,6 +13,8 @@ public final enum class MyEnum : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt index cef7eb2edc5..26e5607b958 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt @@ -13,6 +13,8 @@ public final enum class J : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt index 269359327fb..8d20256a12b 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt @@ -13,6 +13,8 @@ public final enum class J : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt index cef7eb2edc5..26e5607b958 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt @@ -13,6 +13,8 @@ public final enum class J : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt index cef7eb2edc5..26e5607b958 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt @@ -13,6 +13,8 @@ public final enum class J : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt index cef7eb2edc5..26e5607b958 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt @@ -13,6 +13,8 @@ public final enum class J : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt index 3be5416bbcd..2df30b91057 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt @@ -17,6 +17,8 @@ public final enum class Direction : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Direction): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.txt index 3be5416bbcd..2df30b91057 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.txt @@ -17,6 +17,8 @@ public final enum class Direction : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Direction): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt index fdfecbbe82b..3122da1c1b9 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt @@ -13,6 +13,8 @@ public final enum class X : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt index fdfecbbe82b..3122da1c1b9 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt @@ -13,6 +13,8 @@ public final enum class X : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt index fdfecbbe82b..3122da1c1b9 100644 --- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt +++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt @@ -13,6 +13,8 @@ public final enum class X : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt b/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt index cef7eb2edc5..26e5607b958 100644 --- a/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt +++ b/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt @@ -13,6 +13,8 @@ public final enum class J : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt index 7424acd0ae3..55092dbb78f 100644 --- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt +++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt @@ -17,6 +17,8 @@ public final enum class X : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt index 7424acd0ae3..55092dbb78f 100644 --- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt +++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt @@ -17,6 +17,8 @@ public final enum class X : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt index 7424acd0ae3..55092dbb78f 100644 --- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt +++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt @@ -17,6 +17,8 @@ public final enum class X : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt index 0bf982364cb..dcbddfb512f 100644 --- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt +++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt @@ -17,6 +17,8 @@ public final enum class X : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt index fdfecbbe82b..3122da1c1b9 100644 --- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt +++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt @@ -13,6 +13,8 @@ public final enum class X : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt b/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt index 4485d4a9505..d3ffdadd602 100644 --- a/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt +++ b/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt @@ -11,6 +11,8 @@ public final enum class E : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt b/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt index fd72cd1b1b0..6f7541f9aa8 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt @@ -40,6 +40,8 @@ package test { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.txt index 85c4f49c873..61e4041c645 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.txt @@ -12,6 +12,8 @@ public final enum class AnnotatedEnumEntry : kotlin.Enum! public final annotation class Anno : kotlin.Annotation { public constructor Anno(/*0*/ value: kotlin.String) diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt index 252279b4780..773285033a9 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt @@ -15,6 +15,8 @@ public interface CustomAnnotation { public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.CustomAnnotation.MyEnum!): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.CustomAnnotation.MyEnum diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt index 53524339d73..f26751bdb70 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt @@ -12,6 +12,8 @@ public open class EnumArgumentWithCustomToString { public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumArgumentWithCustomToString.E!): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumArgumentWithCustomToString.E diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt index bdcea09ddb6..b0bc02b754f 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt @@ -9,6 +9,8 @@ public final enum class EnumConstructorParameter : kotlin.Enum! public final annotation class Anno : kotlin.Annotation { public constructor Anno(/*0*/ value: kotlin.String) diff --git a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt index d9b0f782ac5..53c6753036c 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt @@ -17,6 +17,8 @@ public open class NestedEnumArgument { public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.NestedEnumArgument.E!): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.NestedEnumArgument.E diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.txt b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.txt index c56e649900c..90643c988c9 100644 --- a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.txt +++ b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.txt @@ -11,7 +11,9 @@ public final enum class EnumMembers : kotlin.Enum { public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumMembers!): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit public open fun first(): kotlin.Boolean + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumMembers diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt index 62cdaa33ab1..4032c3f43f0 100644 --- a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt +++ b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt @@ -10,6 +10,8 @@ public open enum class EnumWithSpecializedEntry : kotlin.Enum! public/*package*/ open class Nested { public/*package*/ constructor Nested() diff --git a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.txt b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.txt index 6ae515619c6..10bbb0fe07d 100644 --- a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.txt +++ b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.txt @@ -10,6 +10,8 @@ public final enum class JavaEnum : kotlin.Enum { public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.JavaEnum!): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.JavaEnum diff --git a/compiler/testData/loadJava/compiledJava/static/Enum.txt b/compiler/testData/loadJava/compiledJava/static/Enum.txt index 6215543c81f..d0187ece6af 100644 --- a/compiler/testData/loadJava/compiledJava/static/Enum.txt +++ b/compiler/testData/loadJava/compiledJava/static/Enum.txt @@ -12,6 +12,8 @@ public final enum class Enum : kotlin.Enum { public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Enum!): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public open inner class Inner { public constructor Inner() diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt index 48d4e0b668f..c9165a468c3 100644 --- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt +++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt @@ -8,6 +8,8 @@ public final enum class StaticMembersInEnum : kotlin.Enum! // Static members public final val CONSTANT: test.StaticMembersInEnum! diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnumFromParents.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnumFromParents.txt index 2f480a2b28b..d03219c7844 100644 --- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnumFromParents.txt +++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnumFromParents.txt @@ -22,6 +22,8 @@ public/*package*/ final enum class StaticMembersInEnum : kotlin.Enum! // Static members public const final override /*1*/ /*fake_override*/ val a: kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt index 931e4929bf2..1a09458b278 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt @@ -14,6 +14,8 @@ public final enum class E : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt b/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt index b944aa705c5..75c9f65e071 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt @@ -10,6 +10,8 @@ public final enum class E : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.txt index e67a135aff6..47e395169b2 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumEntry.txt @@ -28,6 +28,8 @@ public final enum class Eee : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Eee): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Eee diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt index 54a8548590b..a4f8cd643c7 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt @@ -20,6 +20,8 @@ public final enum class E : kotlin.Enum { public final fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E diff --git a/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt b/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt index 348e8c424e9..2220215fc46 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt +++ b/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt @@ -8,6 +8,8 @@ public final enum class EnumWithGenericConstructorParameter : kotlin.Enum(): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumWithGenericConstructorParameter): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumWithGenericConstructorParameter diff --git a/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt b/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt index b1ab4756b17..37e54c3c3e2 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt +++ b/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt @@ -8,6 +8,8 @@ public final enum class EnumWithPrimitiveConstructorParameter : kotlin.Enum(): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumWithPrimitiveConstructorParameter): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumWithPrimitiveConstructorParameter diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt b/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt index a3050d07f80..25ef87c658c 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt +++ b/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt @@ -10,6 +10,8 @@ internal final enum class In : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.In): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.In @@ -26,6 +28,8 @@ private final enum class Pr : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Pr): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Pr @@ -42,6 +46,8 @@ public final enum class Pu : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Pu): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Pu diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt b/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt index a3ebe3f68b5..0b8a3a131c2 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt +++ b/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt @@ -18,6 +18,8 @@ public final enum class En : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.En): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.En diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt b/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt index fa830099f83..e1280994267 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt +++ b/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt @@ -15,6 +15,8 @@ public final enum class Enum : kotlin.Enum { protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Enum): kotlin.Int public final fun f(): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! public final inner class Inner { /*primary*/ public constructor Inner() diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt b/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt index befc9905d7f..27d4b41a19d 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt +++ b/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt @@ -13,6 +13,8 @@ public final class A { public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.A.E): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.A.E diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt b/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt index f1a5c15c0ac..0cc66d80f13 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt @@ -17,6 +17,8 @@ public final class A { public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.A.E): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.A.E diff --git a/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt b/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt index 128faaf42bf..c5f4e8d72ce 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt +++ b/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt @@ -10,6 +10,8 @@ public final enum class MyEnum : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.MyEnum): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.MyEnum diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt index be04bab5435..8b65251fc06 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt @@ -12,6 +12,8 @@ public final enum class Test : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Test): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Test diff --git a/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt b/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt index b21d8ed86a3..e699668d329 100644 --- a/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt +++ b/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt @@ -24,6 +24,8 @@ public final enum class E : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun (): kotlin.Int protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int + protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit + public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class! // Static members public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E diff --git a/idea/testData/structureView/fileStructure/InheritedMembersOfEnum.after b/idea/testData/structureView/fileStructure/InheritedMembersOfEnum.after index bac2cef44f5..b22e84a0814 100644 --- a/idea/testData/structureView/fileStructure/InheritedMembersOfEnum.after +++ b/idea/testData/structureView/fileStructure/InheritedMembersOfEnum.after @@ -3,7 +3,9 @@ clone(): Any location=→Enum compareTo(E): Int location=→Enum equals(Any?): Boolean location=→Enum + finalize(): Unit location=→Enum FIRST + getDeclaringClass(): Class! location=→Enum hashCode(): Int location=→Enum name: String location=→Enum ordinal: Int location=→Enum