From 6fed67b36c768e7f34b455183f6ea900630a6091 Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Mon, 13 Dec 2021 17:30:45 +0300 Subject: [PATCH] Revert "Revert "Fix `setCompileTimeInitializer` usage in MemberDeserializer.kt"" This reverts commit 965bab2d2d806cab7c9c12d0145a2821c6ca474e. --- .../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 64e61f086a6..3627dac4725 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.setCompileTimeInitializer( + property.setCompileTimeInitializerFactory { c.storageManager.createNullableLazyValue { val container = c.containingDeclaration.asProtoContainer()!! c.components.annotationAndConstantLoader.loadAnnotationDefaultValue(container, proto, property.returnType) } - ) + } } property.initialize(