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

K2: fix field annotation handling around serialization

Browse Source 
#KT-57135 Fixed
This commit is contained in:
Mikhail Glukhikh
2023-03-23 14:10:08 +01:00
committed by Space Team
parent dc38ce24f7
commit f6bf7560a6
15 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.fir.txt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ public final class Class : R|kotlin/Any| {
public constructor(): R|test/Class|
public final companion object Companion : R|kotlin/Any| {
@FIELD:R|test/Anno|() public final var property: R|kotlin/Int|
field:@FIELD:R|test/Anno|() public final var property: R|kotlin/Int|
public get(): R|kotlin/Int|
public set(value: R|kotlin/Int|): R|kotlin/Unit|
compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.fir.txt
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
public final class Class : R|kotlin/Any| {
@R|test/Anno|(t = R|java/lang/annotation/ElementType.METHOD|) public final fun foo(): R|kotlin/Unit|
@FIELD:R|test/Anno|(t = R|java/lang/annotation/ElementType.FIELD|) public final var bar: R|kotlin/Int|
field:@FIELD:R|test/Anno|(t = R|java/lang/annotation/ElementType.FIELD|) public final var bar: R|kotlin/Int|
public get(): R|kotlin/Int|
public set(value: R|kotlin/Int|): R|kotlin/Unit|
compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.fir.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
}
public final class Class : R|kotlin/Any| {
@FIELD:R|test/Anno|() public final var property: R|kotlin/Int|
field:@FIELD:R|test/Anno|() public final var property: R|kotlin/Int|
public get(): R|kotlin/Int|
public set(value: R|kotlin/Int|): R|kotlin/Unit|
compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
@FIELD:R|test/Anno|(t = R|java/lang/annotation/ElementType.FIELD|) public final val bar: R|kotlin/Int|
field:@FIELD:R|test/Anno|(t = R|java/lang/annotation/ElementType.FIELD|) public final val bar: R|kotlin/Int|
public get(): R|kotlin/Int|
@R|test/Anno|(t = R|java/lang/annotation/ElementType.METHOD|) public final fun foo(): R|kotlin/Unit|
compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
@FIELD:R|test/Anno|(t = <implicitArrayOf>(R|java/lang/annotation/ElementType.PACKAGE|)) public final val bar: R|kotlin/Int|
field:@FIELD:R|test/Anno|(t = <implicitArrayOf>(R|java/lang/annotation/ElementType.PACKAGE|)) public final val bar: R|kotlin/Int|
public get(): R|kotlin/Int|
@R|test/Anno|(t = <implicitArrayOf>()) public final fun baz(): R|kotlin/Unit|
compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
@FIELD:R|test/Anno|() public final var property: R|kotlin/Int|
field:@FIELD:R|test/Anno|() public final var property: R|kotlin/Int|
public get(): R|kotlin/Int|
public set(value: R|kotlin/Int|): R|kotlin/Unit|
compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
@FIELD:R|test/Anno|(t = <implicitArrayOf>(String(prosper))) public final val bar: R|kotlin/Int|
field:@FIELD:R|test/Anno|(t = <implicitArrayOf>(String(prosper))) public final val bar: R|kotlin/Int|
public get(): R|kotlin/Int|
@R|test/Anno|(t = <implicitArrayOf>()) public final fun baz(): R|kotlin/Unit|
compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.fir.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
}
public final class Class : R|kotlin/Any| {
@PROPERTY_DELEGATE_FIELD:R|test/Anno|() public final val property: R|kotlin/String|
field:@PROPERTY_DELEGATE_FIELD:R|test/Anno|() public final val property: R|kotlin/String|
public get(): R|kotlin/String|
public constructor(): R|test/Class|
compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.fir.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
}
public final class Class : R|kotlin/Any| {
@FIELD:R|test/Anno|() public final var property: R|kotlin/Int|
field:@FIELD:R|test/Anno|() public final var property: R|kotlin/Int|
public get(): R|kotlin/Int|
public set(value: R|kotlin/Int|): R|kotlin/Unit|
compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/JvmFieldInInterfaceCompanion.fir.txt
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
public abstract interface I : R|kotlin/Any| {
public final companion object Companion : R|kotlin/Any| {
@FIELD:R|kotlin/jvm/JvmField|() public final val x: R|kotlin/String|
field:@FIELD:R|kotlin/jvm/JvmField|() public final val x: R|kotlin/String|
public get(): R|kotlin/String|
@FIELD:R|kotlin/jvm/JvmField|() public final val y: R|kotlin/String|
field:@FIELD:R|kotlin/jvm/JvmField|() public final val y: R|kotlin/String|
public get(): R|kotlin/String|
private constructor(): R|test/I.Companion|
compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.fir.k1.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
@R|test/A|(s = String(1)) @R|kotlin/jvm/JvmName|(name = String(bar)) public final fun foo(): R|kotlin/String|
@FIELD:R|test/A|(s = String(2)) public final var v: R|kotlin/Int|
field:@FIELD:R|test/A|(s = String(2)) public final var v: R|kotlin/Int|
@R|test/A|(s = String(3)) @R|kotlin/jvm/JvmName|(name = String(vget)) public get(): R|kotlin/Int|
@R|test/A|(s = String(4)) @R|kotlin/jvm/JvmName|(name = String(vset)) public set(<set-?>: R|kotlin/Int|): R|kotlin/Unit|
compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.fir.k2.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
@R|test/A|(s = String(1)) @R|kotlin/jvm/JvmName|(name = String(bar)) public final fun foo(): R|kotlin/String|
@FIELD:R|test/A|(s = String(2)) public final var v: R|kotlin/Int|
field:@FIELD:R|test/A|(s = String(2)) public final var v: R|kotlin/Int|
@R|test/A|(s = String(3)) @R|kotlin/jvm/JvmName|(name = String(vget)) public get(): R|kotlin/Int|
@R|test/A|(s = String(4)) @R|kotlin/jvm/JvmName|(name = String(vset)) public set(value: R|kotlin/Int|): R|kotlin/Unit|