From 4c7f8ba1961f856138784e22b1e460cf872d3b52 Mon Sep 17 00:00:00 2001 From: Pavel Mikhailovskii Date: Thu, 9 Feb 2023 20:13:56 +0000 Subject: [PATCH] KT-56457 Annotate Enum.entries with @NotNull --- .../kotlin/backend/jvm/codegen/FunctionCodegen.kt | 12 +++++++++--- ...emberExtensionPropertyAndImportFromObject.fir.txt | 2 +- ...xtensionPropertyAndLocalDelegatedProperty.fir.txt | 2 +- .../delegateToSingleton/delegateToEnum.ir.txt | 2 +- .../delegateToEnumInAClass.ir.txt | 2 +- .../delegateToSingleton/withSideEffectsToEnum.ir.txt | 2 +- .../deprecated/deprecatedEnumEntryFields.ir.txt | 2 +- .../testData/codegen/bytecodeListing/enumEntries.txt | 8 ++++---- .../bytecodeListing/allOpenOnNotClasses.fir.txt | 2 +- .../atomicfu-compiler/testData/box/TraceTest.txt | 2 +- .../content/anonymousWhenMapping/signatures.txt | 2 +- .../testData/content/whenMapping/signatures.txt | 2 +- .../testData/converter/abstractEnum.ir.txt | 4 ++++ .../testData/converter/annotations.ir.txt | 2 ++ .../testData/converter/annotations2.ir.txt | 1 + .../testData/converter/comments.ir.txt | 1 + .../testData/converter/commentsRemoved.ir.txt | 1 + .../converter/defaultParameterValueOff.ir.txt | 1 + .../converter/defaultParameterValueOn.ir.txt | 1 + .../testData/converter/enumImports.ir.txt | 1 + .../testData/converter/enumInCompanion.ir.txt | 4 ++++ .../kapt3-compiler/testData/converter/enums.ir.txt | 4 ++++ .../testData/converter/inheritanceSimple.ir.txt | 1 + .../testData/converter/invalidFieldName.ir.txt | 1 + .../testData/converter/nestedClasses.ir.txt | 1 + .../testData/converter/repeatableAnnotations.ir.txt | 1 + .../testData/converter/strangeIdentifiers.ir.txt | 1 + .../testData/converter/stripMetadata.ir.txt | 1 + .../converter/unsafePropertyInitializers.ir.txt | 1 + .../testData/bytecodeListing/annoOnNotClass.fir.txt | 2 +- 30 files changed, 51 insertions(+), 18 deletions(-) diff --git a/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt index e7b87049dcd..e6c7fcaeb2d 100644 --- a/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt +++ b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt @@ -74,7 +74,7 @@ class FunctionCodegen(private val irFunction: IrFunction, private val classCodeg generateParameterNames(irFunction, methodVisitor, context.state) } - if (irFunction.origin !in methodOriginsWithoutAnnotations) { + if (irFunction.isWithAnnotations) { val skipNullabilityAnnotations = flags and Opcodes.ACC_PRIVATE != 0 || flags and Opcodes.ACC_SYNTHETIC != 0 object : AnnotationCodegen(classCodegen, skipNullabilityAnnotations) { override fun visitAnnotation(descr: String, visible: Boolean): AnnotationVisitor { @@ -306,13 +306,12 @@ class FunctionCodegen(private val irFunction: IrFunction, private val classCodeg } companion object { - internal val methodOriginsWithoutAnnotations = + private val methodOriginsWithoutAnnotations = setOf( // Not generating parameter annotations for default stubs fixes KT-7892, though // this certainly looks like a workaround for a javac bug. IrDeclarationOrigin.FUNCTION_FOR_DEFAULT_PARAMETER, JvmLoweredDeclarationOrigin.SYNTHETIC_ACCESSOR, - IrDeclarationOrigin.ENUM_CLASS_SPECIAL_MEMBER, IrDeclarationOrigin.GENERATED_SINGLE_FIELD_VALUE_CLASS_MEMBER, IrDeclarationOrigin.BRIDGE, IrDeclarationOrigin.BRIDGE_SPECIAL, @@ -321,6 +320,13 @@ class FunctionCodegen(private val irFunction: IrFunction, private val classCodeg IrDeclarationOrigin.IR_BUILTINS_STUB, IrDeclarationOrigin.PROPERTY_DELEGATE, ) + + private val IrFunction.isWithAnnotations: Boolean + get() = when (origin) { + in methodOriginsWithoutAnnotations -> false + IrDeclarationOrigin.ENUM_CLASS_SPECIAL_MEMBER -> name.asString() == "" + else -> true + } } } diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.fir.txt b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.fir.txt index ee58c1bb5da..1f9c82e0fb3 100644 --- a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.fir.txt +++ b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.fir.txt @@ -15,7 +15,7 @@ public final enum class E { private synthetic final static method $values(): E[] static method (): void private method (p0: java.lang.String, p1: int): void - public static method getEntries(): kotlin.enums.EnumEntries + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): E public static method values(): E[] } diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.fir.txt b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.fir.txt index 4549446e826..e6ad914ede2 100644 --- a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.fir.txt +++ b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.fir.txt @@ -15,7 +15,7 @@ public final enum class E { private synthetic final static method $values(): E[] static method (): void private method (p0: java.lang.String, p1: int): void - public static method getEntries(): kotlin.enums.EnumEntries + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): E public static method values(): E[] } diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/delegateToEnum.ir.txt b/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/delegateToEnum.ir.txt index 3a23df23fef..2af80c021b2 100644 --- a/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/delegateToEnum.ir.txt +++ b/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/delegateToEnum.ir.txt @@ -20,7 +20,7 @@ public final enum class E { private synthetic final static method $values(): E[] static method (): void private method (p0: java.lang.String, p1: int): void - public static method getEntries(): kotlin.enums.EnumEntries + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): E public static method values(): E[] } diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/delegateToEnumInAClass.ir.txt b/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/delegateToEnumInAClass.ir.txt index 8a9e6890117..6742b95ef54 100644 --- a/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/delegateToEnumInAClass.ir.txt +++ b/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/delegateToEnumInAClass.ir.txt @@ -29,7 +29,7 @@ public final enum class E { private synthetic final static method $values(): E[] static method (): void private method (p0: java.lang.String, p1: int): void - public static method getEntries(): kotlin.enums.EnumEntries + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): E public static method values(): E[] } diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/withSideEffectsToEnum.ir.txt b/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/withSideEffectsToEnum.ir.txt index 9bc13afb0ca..50b98c12f97 100644 --- a/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/withSideEffectsToEnum.ir.txt +++ b/compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/withSideEffectsToEnum.ir.txt @@ -17,7 +17,7 @@ public final enum class E { private synthetic final static method $values(): E[] static method (): void private method (p0: java.lang.String, p1: int): void - public static method getEntries(): kotlin.enums.EnumEntries + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): E public static method values(): E[] public final inner class E$Companion diff --git a/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.ir.txt b/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.ir.txt index 07e2d00ddf3..bf2e628e73c 100644 --- a/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.ir.txt +++ b/compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.ir.txt @@ -10,7 +10,7 @@ public final enum class Test { private synthetic final static method $values(): Test[] static method (): void private method (p0: java.lang.String, p1: int): void - public static method getEntries(): kotlin.enums.EnumEntries + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): Test public static method values(): Test[] } diff --git a/compiler/testData/codegen/bytecodeListing/enumEntries.txt b/compiler/testData/codegen/bytecodeListing/enumEntries.txt index 662d80af511..cebbd7560e0 100644 --- a/compiler/testData/codegen/bytecodeListing/enumEntries.txt +++ b/compiler/testData/codegen/bytecodeListing/enumEntries.txt @@ -16,7 +16,7 @@ public final enum class SimpleEnum { private synthetic final static method $values(): SimpleEnum[] static method (): void private method (p0: java.lang.String, p1: int): void - public static method getEntries(): kotlin.enums.EnumEntries + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): SimpleEnum public static method values(): SimpleEnum[] } @@ -32,7 +32,7 @@ public final enum class WithAnnotations { private synthetic final static method $values(): WithAnnotations[] static method (): void private method (p0: java.lang.String, p1: int): void - public static method getEntries(): kotlin.enums.EnumEntries + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): WithAnnotations public static method values(): WithAnnotations[] } @@ -50,7 +50,7 @@ public final enum class WithConstructor { private synthetic final static method $values(): WithConstructor[] static method (): void private method (p0: java.lang.String, p1: int, p2: java.lang.String): void - public static method getEntries(): kotlin.enums.EnumEntries + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String public static method valueOf(p0: java.lang.String): WithConstructor public static method values(): WithConstructor[] @@ -77,7 +77,7 @@ public abstract enum class WithEntryClass { private method (p0: java.lang.String, p1: int): void public synthetic method (p0: java.lang.String, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void public abstract method foo(): void - public static method getEntries(): kotlin.enums.EnumEntries + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): WithEntryClass public static method values(): WithEntryClass[] } diff --git a/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.fir.txt b/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.fir.txt index 88aa96262cc..98926e8bd64 100644 --- a/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.fir.txt +++ b/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.fir.txt @@ -15,7 +15,7 @@ public final enum class Enum { private synthetic final static method $values(): Enum[] static method (): void private method (p0: java.lang.String, p1: int): void - public static method getEntries(): kotlin.enums.EnumEntries + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): Enum public static method values(): Enum[] } diff --git a/plugins/atomicfu/atomicfu-compiler/testData/box/TraceTest.txt b/plugins/atomicfu/atomicfu-compiler/testData/box/TraceTest.txt index f4ad7d29c65..7e6baab3d22 100644 --- a/plugins/atomicfu/atomicfu-compiler/testData/box/TraceTest.txt +++ b/plugins/atomicfu/atomicfu-compiler/testData/box/TraceTest.txt @@ -9,7 +9,7 @@ final enum class TraceTest$Status { private synthetic final static method $values(): TraceTest$Status[] static method (): void private method (p0: java.lang.String, p1: int): void - public static method getEntries(): kotlin.enums.EnumEntries + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): TraceTest$Status public static method values(): TraceTest$Status[] private final inner class TraceTest$Status diff --git a/plugins/jvm-abi-gen/testData/content/anonymousWhenMapping/signatures.txt b/plugins/jvm-abi-gen/testData/content/anonymousWhenMapping/signatures.txt index 5756c736887..f56ede30977 100644 --- a/plugins/jvm-abi-gen/testData/content/anonymousWhenMapping/signatures.txt +++ b/plugins/jvm-abi-gen/testData/content/anonymousWhenMapping/signatures.txt @@ -5,7 +5,7 @@ public final enum class test/E { public final enum static field B: test.E public static method values(): test.E[] public static method valueOf(p0: java.lang.String): test.E - public static method getEntries(): kotlin.enums.EnumEntries + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries } @kotlin.Metadata public final class test/Test { diff --git a/plugins/jvm-abi-gen/testData/content/whenMapping/signatures.txt b/plugins/jvm-abi-gen/testData/content/whenMapping/signatures.txt index 45ae05cfd09..6fc0e7ed439 100644 --- a/plugins/jvm-abi-gen/testData/content/whenMapping/signatures.txt +++ b/plugins/jvm-abi-gen/testData/content/whenMapping/signatures.txt @@ -5,7 +5,7 @@ public final enum class test/E { public final enum static field B: test.E public static method values(): test.E[] public static method valueOf(p0: java.lang.String): test.E - public static method getEntries(): kotlin.enums.EnumEntries + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries } @kotlin.Metadata public synthetic final class test/Test$WhenMappings { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.ir.txt index 0f62221d06a..5f9506948ac 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.ir.txt @@ -11,6 +11,7 @@ public enum E { public final void b() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } @@ -50,6 +51,7 @@ public enum E2 { public abstract void a(); + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } @@ -73,6 +75,7 @@ public enum E3 { return null; } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } @@ -110,6 +113,7 @@ public enum E4 { return false; } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations.ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations.ir.txt index 234316398f5..2d29b8c8223 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations.ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations.ir.txt @@ -50,6 +50,7 @@ public enum Colors { Colors() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } @@ -67,6 +68,7 @@ public enum Enum1 { Enum1() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.ir.txt index d2d2cd0bd67..c96ef1067a0 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.ir.txt @@ -60,6 +60,7 @@ public enum Enum { return 0; } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/comments.ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/comments.ir.txt index ac8be79a404..5bd2c0483f8 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/comments.ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/comments.ir.txt @@ -19,6 +19,7 @@ public enum EnumError { @org.jetbrains.annotations.NotNull() public abstract java.lang.String doIt(); + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved.ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved.ir.txt index a301af24614..1ed74caf85b 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved.ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/commentsRemoved.ir.txt @@ -19,6 +19,7 @@ public enum EnumError { @org.jetbrains.annotations.NotNull() public abstract java.lang.String doIt(); + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.ir.txt index ca3dccf1547..04c983697f8 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.ir.txt @@ -6,6 +6,7 @@ public enum Em { Em() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.ir.txt index 378d5cb6963..d1ed34a1a83 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.ir.txt @@ -6,6 +6,7 @@ public enum Em { Em() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enumImports.ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enumImports.ir.txt index 05af741b83b..ddba00e4129 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/enumImports.ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enumImports.ir.txt @@ -11,6 +11,7 @@ public enum Options { Options() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.ir.txt index bb1e8a288bf..d223b83faf8 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enumInCompanion.ir.txt @@ -23,6 +23,7 @@ public final class Test { Example() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } @@ -58,6 +59,7 @@ public final class Test2 { Example() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } @@ -93,6 +95,7 @@ public final class Test3 { Example() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } @@ -175,6 +178,7 @@ public final class Test5 { Example() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enums.ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enums.ir.txt index 1b00a526528..5b885c62d8c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/enums.ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enums.ir.txt @@ -16,6 +16,7 @@ public enum Enum1 { Enum1() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } @@ -57,6 +58,7 @@ public enum Enum2 { public final void publicEnumFun() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } @@ -75,6 +77,7 @@ public abstract interface I { Nested() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } @@ -91,6 +94,7 @@ public enum Nested1 { Nested1() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.ir.txt index 43a90f00369..f5c06826317 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.ir.txt @@ -46,6 +46,7 @@ public enum Result { Result() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.ir.txt index 9a12ed5cf8e..b21ace2dd5f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.ir.txt @@ -16,6 +16,7 @@ public enum Color { Color() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.ir.txt index 402c4b63b14..8262fc27177 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.ir.txt @@ -149,6 +149,7 @@ public final class Test { NestedEnum() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.ir.txt index 5095aa27f70..c35f80de679 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.ir.txt @@ -149,6 +149,7 @@ public enum Color { Color() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.ir.txt index 98c2216c501..2b54af5bff0 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.ir.txt @@ -24,6 +24,7 @@ public enum StrangeEnum { return null; } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.ir.txt index 61364cde2dc..0ee0b2cbb48 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/stripMetadata.ir.txt @@ -42,6 +42,7 @@ public enum Result { Result() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.ir.txt index 7274716a3c9..2582d853e6f 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.ir.txt @@ -222,6 +222,7 @@ public enum State { State() { } + @org.jetbrains.annotations.NotNull() public static kotlin.enums.EnumEntries getEntries() { return null; } diff --git a/plugins/noarg/testData/bytecodeListing/annoOnNotClass.fir.txt b/plugins/noarg/testData/bytecodeListing/annoOnNotClass.fir.txt index 0d045358bf5..d7bb8259c3e 100644 --- a/plugins/noarg/testData/bytecodeListing/annoOnNotClass.fir.txt +++ b/plugins/noarg/testData/bytecodeListing/annoOnNotClass.fir.txt @@ -10,7 +10,7 @@ public final enum class Colors { private synthetic final static method $values(): Colors[] static method (): void private method (p0: java.lang.String, p1: int): void - public static method getEntries(): kotlin.enums.EnumEntries + public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries public static method valueOf(p0: java.lang.String): Colors public static method values(): Colors[] }