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

FIR deserializer: proper annotation loading for value parameter of property setter

Browse Source
This commit is contained in:
Jinseong Jeon
2020-06-29 15:51:01 -07:00
committed by Dmitriy Novozhilov
parent 9308525d93
commit fab9ee47f9
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ public final annotation class A : R|kotlin/Annotation| {
public final class Class : R|kotlin/Any| { public final class Class : R|kotlin/Any| {
public final var R|kotlin/Int|.foo: R|kotlin/Int| public final var R|kotlin/Int|.foo: R|kotlin/Int|
public get(): R|kotlin/Int| public get(): R|kotlin/Int|
public set(value: R|kotlin/Int|): R|kotlin/Unit| public set(@R|test/A|() value: R|kotlin/Int|): R|kotlin/Unit|
public constructor(): R|test/Class| public constructor(): R|test/Class|
compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ public final annotation class A : R|kotlin/Annotation| {
public final class Class : R|kotlin/Any| { public final class Class : R|kotlin/Any| {
public final var foo: R|kotlin/Int| public final var foo: R|kotlin/Int|
public get(): R|kotlin/Int| public get(): R|kotlin/Int|
public set(value: R|kotlin/Int|): R|kotlin/Unit| public set(@R|test/A|() value: R|kotlin/Int|): R|kotlin/Unit|
public constructor(): R|test/Class| public constructor(): R|test/Class|
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt
+5 -14
View File
@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.metadata.ProtoBuf
import org.jetbrains.kotlin.metadata.deserialization.* import org.jetbrains.kotlin.metadata.deserialization.*
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.protobuf.MessageLite import org.jetbrains.kotlin.protobuf.MessageLite
import org.jetbrains.kotlin.serialization.deserialization.ProtoEnumFlags import org.jetbrains.kotlin.serialization.deserialization.ProtoEnumFlags
import org.jetbrains.kotlin.serialization.deserialization.builtins.BuiltInSerializerProtocol import org.jetbrains.kotlin.serialization.deserialization.builtins.BuiltInSerializerProtocol
@@ -233,19 +232,11 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
c.containerSource, proto, local.nameResolver, local.typeTable, setterFlags c.containerSource, proto, local.nameResolver, local.typeTable, setterFlags
) )
this.symbol = FirPropertyAccessorSymbol() this.symbol = FirPropertyAccessorSymbol()
valueParameters += proto.setterValueParameter.let { valueParameters += local.memberDeserializer.valueParameters(
val parameterFlags = if (it.hasFlags()) it.flags else 0 listOf(proto.setterValueParameter),
buildValueParameter { proto,
session = c.session AbstractAnnotationDeserializer.CallableKind.PROPERTY_SETTER
origin = FirDeclarationOrigin.Library )
this.returnTypeRef = returnTypeRef
name = if (it.hasName()) c.nameResolver.getName(it.name) else Name.special("<default-setter-parameter>")
this.symbol = FirVariableSymbol(CallableId(FqName.ROOT, name))
isCrossinline = Flags.IS_CROSSINLINE.get(parameterFlags)
isNoinline = Flags.IS_NOINLINE.get(parameterFlags)
isVararg = it.hasVarargElementType()
}
}
} }
} else { } else {
FirDefaultPropertySetter(null, c.session, FirDeclarationOrigin.Library, returnTypeRef, visibility) FirDefaultPropertySetter(null, c.session, FirDeclarationOrigin.Library, returnTypeRef, visibility)