StorageManager for compile-time initializer

2014-02-12 19:59:35 +04:00
parent 17259a052e
commit df3ed5059c
27 changed files with 75 additions and 89 deletions
@@ -267,7 +267,10 @@ public abstract class LazyJavaMemberScope(
        propertyDescriptor.setType(effectiveSignature.getReturnType(), Collections.emptyList(), DescriptorUtils.getExpectedThisObjectIfNeeded(getContainingDeclaration()), null : JetType?)

        if (!propertyDescriptor.isVar()) {
-            propertyDescriptor.setCompileTimeInitializer(JavaPropertyInitializerEvaluator.getInstance().getInitializerConstant(field, propertyDescriptor))
+            propertyDescriptor.setCompileTimeInitializer(
+                    c.storageManager.createNullableLazyValue {
+                        JavaPropertyInitializerEvaluator.getInstance().getInitializerConstant(field, propertyDescriptor)
+                    })
        }

        c.javaResolverCache.recordField(field, propertyDescriptor);