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

Revert "Fix setCompileTimeInitializer usage in MemberDeserializer.kt"

Browse Source 
This reverts commit 9281ab334a.
This commit is contained in:
Nikolay Krasko
2021-12-10 14:16:51 +03:00
committed by TeamCityServer
parent 8c3b1dc55a
commit 965bab2d2d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
+2 -2
View File
@@ -141,12 +141,12 @@ class MemberDeserializer(private val c: DeserializationContext) {
} }
if ((c.containingDeclaration as? ClassDescriptor)?.kind == ClassKind.ANNOTATION_CLASS) { if ((c.containingDeclaration as? ClassDescriptor)?.kind == ClassKind.ANNOTATION_CLASS) {
property.setCompileTimeInitializerFactory { property.setCompileTimeInitializer(
c.storageManager.createNullableLazyValue { c.storageManager.createNullableLazyValue {
val container = c.containingDeclaration.asProtoContainer()!! val container = c.containingDeclaration.asProtoContainer()!!
c.components.annotationAndConstantLoader.loadAnnotationDefaultValue(container, proto, property.returnType) c.components.annotationAndConstantLoader.loadAnnotationDefaultValue(container, proto, property.returnType)
} }
} )
} }
property.initialize( property.initialize(