FIR deserializer: load annotations on default accessors
This commit is contained in:
committed by
Mikhail Glukhikh
parent
c25742c91a
commit
49307e243c
+11
-8
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.FirSession
|
|||||||
import org.jetbrains.kotlin.fir.declarations.*
|
import org.jetbrains.kotlin.fir.declarations.*
|
||||||
import org.jetbrains.kotlin.fir.declarations.builder.*
|
import org.jetbrains.kotlin.fir.declarations.builder.*
|
||||||
import org.jetbrains.kotlin.fir.declarations.impl.*
|
import org.jetbrains.kotlin.fir.declarations.impl.*
|
||||||
|
import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
|
||||||
import org.jetbrains.kotlin.fir.expressions.FirExpression
|
import org.jetbrains.kotlin.fir.expressions.FirExpression
|
||||||
import org.jetbrains.kotlin.fir.expressions.builder.buildExpressionStub
|
import org.jetbrains.kotlin.fir.expressions.builder.buildExpressionStub
|
||||||
import org.jetbrains.kotlin.fir.symbols.CallableId
|
import org.jetbrains.kotlin.fir.symbols.CallableId
|
||||||
@@ -223,16 +224,17 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
|
|||||||
isInline = Flags.IS_INLINE_ACCESSOR.get(getterFlags)
|
isInline = Flags.IS_INLINE_ACCESSOR.get(getterFlags)
|
||||||
isExternal = Flags.IS_EXTERNAL_ACCESSOR.get(getterFlags)
|
isExternal = Flags.IS_EXTERNAL_ACCESSOR.get(getterFlags)
|
||||||
}
|
}
|
||||||
annotations +=
|
|
||||||
c.annotationDeserializer.loadPropertyGetterAnnotations(
|
|
||||||
c.containerSource, proto, local.nameResolver, local.typeTable, getterFlags
|
|
||||||
)
|
|
||||||
this.symbol = FirPropertyAccessorSymbol()
|
this.symbol = FirPropertyAccessorSymbol()
|
||||||
}.apply {
|
}.apply {
|
||||||
versionRequirementsTable = c.versionRequirementTable
|
versionRequirementsTable = c.versionRequirementTable
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
FirDefaultPropertyGetter(null, c.session, FirDeclarationOrigin.Library, returnTypeRef, visibility)
|
FirDefaultPropertyGetter(null, c.session, FirDeclarationOrigin.Library, returnTypeRef, visibility)
|
||||||
|
}.apply {
|
||||||
|
(annotations as MutableList<FirAnnotationCall>) +=
|
||||||
|
c.annotationDeserializer.loadPropertyGetterAnnotations(
|
||||||
|
c.containerSource, proto, local.nameResolver, local.typeTable, getterFlags
|
||||||
|
)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
null
|
null
|
||||||
@@ -253,10 +255,6 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
|
|||||||
isInline = Flags.IS_INLINE_ACCESSOR.get(setterFlags)
|
isInline = Flags.IS_INLINE_ACCESSOR.get(setterFlags)
|
||||||
isExternal = Flags.IS_EXTERNAL_ACCESSOR.get(setterFlags)
|
isExternal = Flags.IS_EXTERNAL_ACCESSOR.get(setterFlags)
|
||||||
}
|
}
|
||||||
annotations +=
|
|
||||||
c.annotationDeserializer.loadPropertySetterAnnotations(
|
|
||||||
c.containerSource, proto, local.nameResolver, local.typeTable, setterFlags
|
|
||||||
)
|
|
||||||
this.symbol = FirPropertyAccessorSymbol()
|
this.symbol = FirPropertyAccessorSymbol()
|
||||||
valueParameters += local.memberDeserializer.valueParameters(
|
valueParameters += local.memberDeserializer.valueParameters(
|
||||||
listOf(proto.setterValueParameter),
|
listOf(proto.setterValueParameter),
|
||||||
@@ -269,6 +267,11 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
FirDefaultPropertySetter(null, c.session, FirDeclarationOrigin.Library, returnTypeRef, visibility)
|
FirDefaultPropertySetter(null, c.session, FirDeclarationOrigin.Library, returnTypeRef, visibility)
|
||||||
|
}.apply {
|
||||||
|
(annotations as MutableList<FirAnnotationCall>) +=
|
||||||
|
c.annotationDeserializer.loadPropertySetterAnnotations(
|
||||||
|
c.containerSource, proto, local.nameResolver, local.typeTable, setterFlags
|
||||||
|
)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
null
|
null
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
// IGNORE_BACKEND_FIR: JVM_IR
|
|
||||||
// TARGET_BACKEND: JVM
|
// TARGET_BACKEND: JVM
|
||||||
// WITH_RUNTIME
|
// WITH_RUNTIME
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
// IGNORE_BACKEND_FIR: JVM_IR
|
|
||||||
// TARGET_BACKEND: JVM
|
// TARGET_BACKEND: JVM
|
||||||
// FILE: A.kt
|
// FILE: A.kt
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
// IGNORE_BACKEND_FIR: JVM_IR
|
|
||||||
// TARGET_BACKEND: JVM
|
// TARGET_BACKEND: JVM
|
||||||
// FILE: A.kt
|
// FILE: A.kt
|
||||||
package lib
|
package lib
|
||||||
|
|||||||
Reference in New Issue
Block a user