Use getter names for $annotations methods in most codegen tests

This is needed to update master to 1.4, while still testing the latest
compiler by default. Also add one test on the old behavior.
This commit is contained in:
Alexander Udalov
2019-12-27 15:59:03 +01:00
parent 330dd789de
commit e2a42446ed
20 changed files with 63 additions and 33 deletions
@@ -1,4 +1,4 @@
// !LANGUAGE: -UseGetterNameForPropertyAnnotationsMethodOnJvm
// !LANGUAGE: +UseGetterNameForPropertyAnnotationsMethodOnJvm
@Target(AnnotationTarget.PROPERTY)
annotation class AnnProperty
@@ -33,4 +33,4 @@ annotation class Anno
@Anno
val p2: Int = 4
get() = field
get() = field
@@ -3,10 +3,10 @@ public final class A {
private final @AnnField @AnnParameterField @AnnTypeField field a: int
private final @AnnField @AnnTypeField field x: int
public method <init>(@AnnParameterProperty @AnnParameterField p0: int): void
public synthetic deprecated static @AnnProperty @AnnFieldProperty @AnnParameterProperty method a$annotations(): void
public synthetic deprecated static @AnnProperty @AnnFieldProperty @AnnParameterProperty method getA$annotations(): void
public final method getA(): int
public synthetic deprecated static @AnnProperty @AnnFieldProperty method getX$annotations(): void
public final method getX(): int
public synthetic deprecated static @AnnProperty @AnnFieldProperty method x$annotations(): void
}
@kotlin.annotation.Target
@@ -1,4 +1,4 @@
// !LANGUAGE: -UseGetterNameForPropertyAnnotationsMethodOnJvm
// !LANGUAGE: +UseGetterNameForPropertyAnnotationsMethodOnJvm
import kotlin.reflect.KProperty
@@ -22,4 +22,4 @@ public class A(@AnnParam @field:AnnField @property:AnnProp2 val x: Int, @param:A
@AnnProp @property:AnnProp2 @delegate:AnnDelegate @property:AnnDelegate
val s: String by CustomDelegate()
}
}
@@ -7,15 +7,15 @@ public final class A {
private field y: int
static method <clinit>(): void
public method <init>(@AnnParam p0: int, @AnnParam p1: int): void
public synthetic deprecated static @AnnProp @AnnProp2 method getP$annotations(): void
public final @AnnGetter method getP(): int
public synthetic deprecated static @AnnProp @AnnProp2 @AnnDelegate method getS$annotations(): void
public final @org.jetbrains.annotations.NotNull method getS(): java.lang.String
public synthetic deprecated static @AnnProp2 method getX$annotations(): void
public final method getX(): int
public final @AnnGetter method getY(): int
public synthetic deprecated static @AnnProp @AnnProp2 method p$annotations(): void
public synthetic deprecated static @AnnProp @AnnProp2 @AnnDelegate method s$annotations(): void
public final @AnnSetter method setP(@AnnParam p0: int): void
public final @AnnSetter method setY(p0: int): void
public synthetic deprecated static @AnnProp2 method x$annotations(): void
}
@java.lang.annotation.Retention