[FIR2IR] Consider property init value from nested class, ^KT-52057 Fixed
This commit is contained in:
+8
-2
@@ -76,6 +76,12 @@ fun deserializeClassToSymbol(
|
||||
containerSource,
|
||||
symbol,
|
||||
annotationDeserializer,
|
||||
if (status.isCompanion) {
|
||||
parentContext.constDeserializer
|
||||
} else {
|
||||
((containerSource as? KotlinJvmBinarySourceElement)?.binaryClass)?.let { FirConstDeserializer(session, it) }
|
||||
?: parentContext.constDeserializer
|
||||
},
|
||||
status.isInner
|
||||
) ?: FirDeserializationContext.createForClass(
|
||||
classId,
|
||||
@@ -203,9 +209,9 @@ fun deserializeClassToSymbol(
|
||||
}
|
||||
it.setSealedClassInheritors(inheritors)
|
||||
}
|
||||
|
||||
|
||||
it.valueClassRepresentation = computeValueClassRepresentation(it, session)
|
||||
|
||||
|
||||
(it.annotations as MutableList<FirAnnotation>) +=
|
||||
context.annotationDeserializer.loadClassAnnotations(classProto, context.nameResolver)
|
||||
|
||||
|
||||
+1
@@ -65,6 +65,7 @@ class FirDeserializationContext(
|
||||
containerSource: DeserializedContainerSource? = this.containerSource,
|
||||
outerClassSymbol: FirRegularClassSymbol? = this.outerClassSymbol,
|
||||
annotationDeserializer: AbstractAnnotationDeserializer = this.annotationDeserializer,
|
||||
constDeserializer: FirConstDeserializer = this.constDeserializer,
|
||||
capturesTypeParameters: Boolean = true,
|
||||
containingDeclarationSymbol: FirBasedSymbol<*>? = this.outerClassSymbol
|
||||
): FirDeserializationContext = FirDeserializationContext(
|
||||
|
||||
Reference in New Issue
Block a user