azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-62560 [SLC] Fix handling of empty varargs in annotations

Browse Source
This commit is contained in:
strangepleasures
2023-11-20 20:57:21 +00:00
committed by Space Team
parent 4f5926a88f
commit 03ed1d1d31
20 changed files with 794 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/kapt3-compiler/testData/converter/annotationWithVaragArguments.fir.txt
Vendored
+175
View File
@@ -0,0 +1,175 @@
/**
* public final annotation class A : kotlin/Annotation {
*
* // signature: <init>([I)V
* public constructor(vararg x: kotlin/Int (* kotlin/IntArray *))
*
* // getter: x()[I
* public final val x: kotlin/IntArray
* public final get
*
* // module name: main
* }
*/
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface A {
public abstract int[] x();
}
////////////////////
/**
* package {
*
* // signature: bar()V
* public final fun bar(): kotlin/Unit
*
* // signature: baz()V
* public final fun baz(): kotlin/Unit
*
* // signature: foo()V
* public final fun foo(): kotlin/Unit
*
* // module name: main
* }
*/
@kotlin.Metadata()
public final class AnnotationWithVaragArgumentsKt {
public AnnotationWithVaragArgumentsKt() {
super();
}
@A(x = {1})
@B(x = "x", y = {1}, z = "z")
@C(a = @A(x = {1}), b = @B(x = "x", y = {1}, z = "z"))
public static final void bar() {
}
@A(x = {1, 2})
@B(x = "x", y = {1, 2}, z = "z")
@C(a = @A(x = {1, 2}), b = @B(x = "x", y = {1, 2}, z = "z"))
public static final void baz() {
}
@A(x = {})
@B(x = "x", z = "z", y = {})
@C(a = @A(x = {}), b = @B(x = "x", z = "z", y = {}))
@D()
@E(d = @D())
public static final void foo() {
}
}
////////////////////
/**
* public final annotation class B : kotlin/Annotation {
*
* // signature: <init>(Ljava/lang/String;[ILjava/lang/String;)V
* public constructor(x: kotlin/String, vararg y: kotlin/Int (* kotlin/IntArray *), z: kotlin/String)
*
* // getter: x()Ljava/lang/String;
* public final val x: kotlin/String
* public final get
*
* // getter: y()[I
* public final val y: kotlin/IntArray
* public final get
*
* // getter: z()Ljava/lang/String;
* public final val z: kotlin/String
* public final get
*
* // module name: main
* }
*/
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface B {
public abstract java.lang.String x();
public abstract int[] y();
public abstract java.lang.String z();
}
////////////////////
/**
* public final annotation class C : kotlin/Annotation {
*
* // signature: <init>(LA;LB;)V
* public constructor(a: A, b: B)
*
* // getter: a()LA;
* public final val a: A
* public final get
*
* // getter: b()LB;
* public final val b: B
* public final get
*
* // module name: main
* }
*/
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface C {
public abstract A a();
public abstract B b();
}
////////////////////
/**
* public final annotation class D : kotlin/Annotation {
*
* // signature: <init>(Lkotlin/Array;)V
* public constructor(vararg x: kotlin/String (* kotlin/Array<out kotlin/String> *) (* = ... *))
*
* // getter: x()[Ljava/lang/String;
* public final val x: kotlin/Array<out kotlin/String>
* public final get
*
* // module name: main
* }
*/
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface D {
public abstract java.lang.String[] x() default {"a", "b"};
}
////////////////////
/**
* public final annotation class E : kotlin/Annotation {
*
* // signature: <init>(LD;)V
* public constructor(d: D)
*
* // getter: d()LD;
* public final val d: D
* public final get
*
* // module name: main
* }
*/
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface E {
public abstract D d();
}
plugins/kapt3/kapt3-compiler/testData/converter/annotationWithVaragArguments.ir.txt
Vendored
+175
View File
@@ -0,0 +1,175 @@
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
/**
* public final annotation class A : kotlin/Annotation {
*
* // signature: <init>([I)V
* public constructor(vararg x: kotlin/Int (* kotlin/IntArray *))
*
* // getter: x()[I
* public final val x: kotlin/IntArray
* public final get
*
* // module name: main
* }
*/
@kotlin.Metadata()
public abstract @interface A {
public abstract int[] x();
}
////////////////////
/**
* package {
*
* // signature: bar()V
* public final fun bar(): kotlin/Unit
*
* // signature: baz()V
* public final fun baz(): kotlin/Unit
*
* // signature: foo()V
* public final fun foo(): kotlin/Unit
*
* // module name: main
* }
*/
@kotlin.Metadata()
public final class AnnotationWithVaragArgumentsKt {
public AnnotationWithVaragArgumentsKt() {
super();
}
@A(x = {})
@B(x = "x", z = "z", y = {})
@C(a = @A(x = {}), b = @B(x = "x", y = {}, z = "z"))
@D()
@E(d = @D())
public static final void foo() {
}
@A(x = {1})
@B(x = "x", y = {1}, z = "z")
@C(a = @A(x = {1}), b = @B(x = "x", y = {1}, z = "z"))
public static final void bar() {
}
@A(x = {1, 2})
@B(x = "x", y = {1, 2}, z = "z")
@C(a = @A(x = {1, 2}), b = @B(x = "x", y = {1, 2}, z = "z"))
public static final void baz() {
}
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
/**
* public final annotation class B : kotlin/Annotation {
*
* // signature: <init>(Ljava/lang/String;[ILjava/lang/String;)V
* public constructor(x: kotlin/String, vararg y: kotlin/Int (* kotlin/IntArray *), z: kotlin/String)
*
* // getter: x()Ljava/lang/String;
* public final val x: kotlin/String
* public final get
*
* // getter: y()[I
* public final val y: kotlin/IntArray
* public final get
*
* // getter: z()Ljava/lang/String;
* public final val z: kotlin/String
* public final get
*
* // module name: main
* }
*/
@kotlin.Metadata()
public abstract @interface B {
public abstract java.lang.String x();
public abstract int[] y();
public abstract java.lang.String z();
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
/**
* public final annotation class C : kotlin/Annotation {
*
* // signature: <init>(LA;LB;)V
* public constructor(a: A, b: B)
*
* // getter: a()LA;
* public final val a: A
* public final get
*
* // getter: b()LB;
* public final val b: B
* public final get
*
* // module name: main
* }
*/
@kotlin.Metadata()
public abstract @interface C {
public abstract A a();
public abstract B b();
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
/**
* public final annotation class D : kotlin/Annotation {
*
* // signature: <init>(Lkotlin/Array;)V
* public constructor(vararg x: kotlin/String (* kotlin/Array<out kotlin/String> *) (* = ... *))
*
* // getter: x()[Ljava/lang/String;
* public final val x: kotlin/Array<out kotlin/String>
* public final get
*
* // module name: main
* }
*/
@kotlin.Metadata()
public abstract @interface D {
public abstract java.lang.String[] x() default {"a", "b"};
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
/**
* public final annotation class E : kotlin/Annotation {
*
* // signature: <init>(LD;)V
* public constructor(d: D)
*
* // getter: d()LD;
* public final val d: D
* public final get
*
* // module name: main
* }
*/
@kotlin.Metadata()
public abstract @interface E {
public abstract D d();
}
plugins/kapt3/kapt3-compiler/testData/converter/annotationWithVaragArguments.kt
Vendored
+22
View File
@@ -0,0 +1,22 @@
annotation class A(vararg val x: Int)
annotation class B(val x: String, vararg val y: Int, val z: String)
annotation class C(val a: A, val b: B)
annotation class D(vararg val x: String = ["a", "b"])
annotation class E(val d: D)
@A
@B(x = "x", z = "z")
@C(A(), B("x", z = "z"))
@D()
@E(d = D())
fun foo() {}
@A(1)
@B("x", 1, z = "z")
@C(A(1), B("x", 1, z = "z"))
fun bar() {}
@A(1, 2)
@B("x", 1, 2, z = "z")
@C(A(1, 2), B("x", 1, 2, z = "z"))
fun baz() {}
plugins/kapt3/kapt3-compiler/testData/converter/annotationWithVaragArguments.txt
Vendored
+175
View File
@@ -0,0 +1,175 @@
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
/**
* public final annotation class A : kotlin/Annotation {
*
* // signature: <init>([I)V
* public constructor(vararg x: kotlin/Int (* kotlin/IntArray *))
*
* // getter: x()[I
* public final val x: kotlin/IntArray
* public final get
*
* // module name: main
* }
*/
@kotlin.Metadata()
public abstract @interface A {
public abstract int[] x();
}
////////////////////
/**
* package {
*
* // signature: bar()V
* public final fun bar(): kotlin/Unit
*
* // signature: baz()V
* public final fun baz(): kotlin/Unit
*
* // signature: foo()V
* public final fun foo(): kotlin/Unit
*
* // module name: main
* }
*/
@kotlin.Metadata()
public final class AnnotationWithVaragArgumentsKt {
public AnnotationWithVaragArgumentsKt() {
super();
}
@A(x = {})
@B(x = "x", z = "z", y = {})
@C(a = @A(x = {}), b = @B(z = "z", y = {}, x = "x"))
@D()
@E(d = @D())
public static final void foo() {
}
@A(x = {1})
@B(x = "x", y = {1}, z = "z")
@C(a = @A(x = {1}), b = @B(z = "z", y = {1}, x = "x"))
public static final void bar() {
}
@A(x = {1, 2})
@B(x = "x", y = {1, 2}, z = "z")
@C(a = @A(x = {1, 2}), b = @B(z = "z", y = {1, 2}, x = "x"))
public static final void baz() {
}
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
/**
* public final annotation class B : kotlin/Annotation {
*
* // signature: <init>(Ljava/lang/String;[ILjava/lang/String;)V
* public constructor(x: kotlin/String, vararg y: kotlin/Int (* kotlin/IntArray *), z: kotlin/String)
*
* // getter: x()Ljava/lang/String;
* public final val x: kotlin/String
* public final get
*
* // getter: y()[I
* public final val y: kotlin/IntArray
* public final get
*
* // getter: z()Ljava/lang/String;
* public final val z: kotlin/String
* public final get
*
* // module name: main
* }
*/
@kotlin.Metadata()
public abstract @interface B {
public abstract java.lang.String x();
public abstract int[] y();
public abstract java.lang.String z();
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
/**
* public final annotation class C : kotlin/Annotation {
*
* // signature: <init>(LA;LB;)V
* public constructor(a: A, b: B)
*
* // getter: a()LA;
* public final val a: A
* public final get
*
* // getter: b()LB;
* public final val b: B
* public final get
*
* // module name: main
* }
*/
@kotlin.Metadata()
public abstract @interface C {
public abstract A a();
public abstract B b();
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
/**
* public final annotation class D : kotlin/Annotation {
*
* // signature: <init>(Lkotlin/Array;)V
* public constructor(vararg x: kotlin/String (* kotlin/Array<out kotlin/String> *) (* = ... *))
*
* // getter: x()[Ljava/lang/String;
* public final val x: kotlin/Array<out kotlin/String>
* public final get
*
* // module name: main
* }
*/
@kotlin.Metadata()
public abstract @interface D {
public abstract java.lang.String[] x() default {"a", "b"};
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
/**
* public final annotation class E : kotlin/Annotation {
*
* // signature: <init>(LD;)V
* public constructor(d: D)
*
* // getter: d()LD;
* public final val d: D
* public final get
*
* // module name: main
* }
*/
@kotlin.Metadata()
public abstract @interface E {
public abstract D d();
}
plugins/kapt3/kapt3-compiler/tests-gen/org/jetbrains/kotlin/kapt3/test/runners/ClassFileToSourceStubConverterTestGenerated.java
Generated
+6
View File
@@ -55,6 +55,12 @@ public class ClassFileToSourceStubConverterTestGenerated extends AbstractClassFi
runTest("plugins/kapt3/kapt3-compiler/testData/converter/annotationWithFqNames.kt");
}
@Test
@TestMetadata("annotationWithVaragArguments.kt")
public void testAnnotationWithVaragArguments() throws Exception {
runTest("plugins/kapt3/kapt3-compiler/testData/converter/annotationWithVaragArguments.kt");
}
@Test
@TestMetadata("annotations.kt")
public void testAnnotations() throws Exception {
plugins/kapt3/kapt3-compiler/tests-gen/org/jetbrains/kotlin/kapt3/test/runners/IrClassFileToSourceStubConverterTestGenerated.java
Generated
+6
View File
@@ -55,6 +55,12 @@ public class IrClassFileToSourceStubConverterTestGenerated extends AbstractIrCla
runTest("plugins/kapt3/kapt3-compiler/testData/converter/annotationWithFqNames.kt");
}
@Test
@TestMetadata("annotationWithVaragArguments.kt")
public void testAnnotationWithVaragArguments() throws Exception {
runTest("plugins/kapt3/kapt3-compiler/testData/converter/annotationWithVaragArguments.kt");
}
@Test
@TestMetadata("annotations.kt")
public void testAnnotations() throws Exception {