From 965bab2d2d806cab7c9c12d0145a2821c6ca474e Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 10 Dec 2021 14:16:51 +0300 Subject: [PATCH] Revert "Fix `setCompileTimeInitializer` usage in MemberDeserializer.kt" This reverts commit 9281ab334a70772e0880e729beb19821b4a2f01a. --- .../serialization/deserialization/MemberDeserializer.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt index 3627dac4725..64e61f086a6 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt @@ -141,12 +141,12 @@ class MemberDeserializer(private val c: DeserializationContext) { } if ((c.containingDeclaration as? ClassDescriptor)?.kind == ClassKind.ANNOTATION_CLASS) { - property.setCompileTimeInitializerFactory { + property.setCompileTimeInitializer( c.storageManager.createNullableLazyValue { val container = c.containingDeclaration.asProtoContainer()!! c.components.annotationAndConstantLoader.loadAnnotationDefaultValue(container, proto, property.returnType) } - } + ) } property.initialize(