diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.java b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.java index b7ec6e97925..13c3dbf14a0 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.java +++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.java @@ -5,6 +5,6 @@ public class ClassObjectArrayInParam { Class[] value(); } - @Anno({ClassObjectArrayInParam.class, Nested.class, String.class}) + @Anno({ClassObjectArrayInParam.class, Nested.class, String.class, java.util.List.class, String[][].class, int[][].class}) public static class Nested {} } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt index 0de08fbe69c..ff98a0c36bb 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt @@ -8,7 +8,7 @@ public open class ClassObjectArrayInParam { public final val value: kotlin.Array> } - @test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam::class, test.ClassObjectArrayInParam.Nested::class, kotlin.String::class}) public open class Nested { + @test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam::class, test.ClassObjectArrayInParam.Nested::class, kotlin.String::class, kotlin.collections.(Mutable)List<(raw) kotlin.Any?>::class, kotlin.Array<(out) kotlin.Array<(out) kotlin.String!>!>::class, kotlin.Array<(out) kotlin.IntArray!>::class}) public open class Nested { public constructor Nested() } } diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt index 8bd15b63fc2..93be51475b9 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt @@ -132,7 +132,7 @@ class LazyJavaAnnotationDescriptor( // Class type is never nullable in 'Foo.class' in Java val type = TypeUtils.makeNotNullable(c.typeResolver.transformJavaType( javaType, - TypeUsage.COMMON.toAttributes(allowFlexible = false)) + TypeUsage.COMMON.toAttributes()) ) val jlClass = c.module.resolveTopLevelClass(FqName("java.lang.Class"), NoLookupLocation.FOR_NON_TRACKED_SCOPE) ?: return null