Revert "[FE 1.0] Provide an API to clean compile time initializer cache for variable descriptor"

This reverts commit 0e6762acc3.

core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaPropertyDescriptor.java

@@ -148,8 +148,8 @@ public class JavaPropertyDescriptor extends PropertyDescriptorImpl implements Ja
 
         enhanced.initialize(newGetter, newSetter, getBackingField(), getDelegateField());
         enhanced.setSetterProjectedOut(isSetterProjectedOut());
-        if (compileTimeInitializerFactory != null) {
-            enhanced.setCompileTimeInitializer(compileTimeInitializer, compileTimeInitializerFactory);
+        if (compileTimeInitializer != null) {
+            enhanced.setCompileTimeInitializer(compileTimeInitializer);
         }
 
         enhanced.setOverriddenDescriptors(getOverriddenDescriptors());

core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt

@@ -307,11 +307,11 @@ abstract class LazyJavaScope(
         )
 
         if (DescriptorUtils.shouldRecordInitializerForProperty(propertyDescriptor, propertyDescriptor.type)) {
-            propertyDescriptor.setCompileTimeInitializerFactory {
+            propertyDescriptor.setCompileTimeInitializer(
                 c.storageManager.createNullableLazyValue {
                     c.components.javaPropertyInitializerEvaluator.getInitializerConstant(field, propertyDescriptor)
                 }
-            }
+            )
         }
 
         c.components.javaResolverCache.recordField(field, propertyDescriptor)

core/descriptors/src/org/jetbrains/kotlin/descriptors/VariableDescriptor.java

@@ -31,11 +31,6 @@ public interface VariableDescriptor extends ValueDescriptor {
     @Nullable
     ConstantValue<?> getCompileTimeInitializer();
 
-    /**
-     * ONLY FOR IDE USE! Please don't use the method inside the compiler
-     */
-    void cleanCompileTimeInitializerCache();
-
     /**
      * @return true if iff original declaration has appropriate flags and type, e.g. `const` modifier in Kotlin.
      * It completely does not means that if isConst then `getCompileTimeInitializer` is not null

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java

@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.descriptors.impl;
 
 import kotlin.annotations.jvm.ReadOnly;
+import kotlin.collections.CollectionsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.descriptors.*;
@@ -524,8 +525,8 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
             substitutedDescriptor.setOverriddenDescriptors(overridden);
         }
 
-        if (isConst() && compileTimeInitializerFactory != null) {
-            substitutedDescriptor.setCompileTimeInitializer(compileTimeInitializer, compileTimeInitializerFactory);
+        if (isConst() && compileTimeInitializer != null) {
+            substitutedDescriptor.setCompileTimeInitializer(compileTimeInitializer);
         }
 
         return substitutedDescriptor;

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ValueParameterDescriptorImpl.kt

@@ -113,9 +113,6 @@ open class ValueParameterDescriptorImpl(
     override fun isVar() = false
 
     override fun getCompileTimeInitializer() = null
-
-    override fun cleanCompileTimeInitializerCache() {}
-
     override fun copy(newOwner: CallableDescriptor, newName: Name, newIndex: Int): ValueParameterDescriptor {
         return ValueParameterDescriptorImpl(
                 newOwner, null, newIndex, annotations, newName, type, declaresDefaultValue(),

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/VariableDescriptorWithInitializerImpl.java

@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.descriptors.impl;
 
-import kotlin.jvm.functions.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
@@ -31,7 +30,6 @@ public abstract class VariableDescriptorWithInitializerImpl extends VariableDesc
     private final boolean isVar;
 
     protected NullableLazyValue<ConstantValue<?>> compileTimeInitializer;
-    protected Function0<NullableLazyValue<ConstantValue<?>>> compileTimeInitializerFactory;
 
     public VariableDescriptorWithInitializerImpl(
             @NotNull DeclarationDescriptor containingDeclaration,
@@ -60,22 +58,8 @@ public abstract class VariableDescriptorWithInitializerImpl extends VariableDesc
         return null;
     }
 
-    public void setCompileTimeInitializerFactory(@NotNull Function0<NullableLazyValue<ConstantValue<?>>> compileTimeInitializerFactory) {
+    public void setCompileTimeInitializer(@NotNull NullableLazyValue<ConstantValue<?>> compileTimeInitializer) {
         assert !isVar() : "Constant value for variable initializer should be recorded only for final variables: " + getName();
-        setCompileTimeInitializer(null, compileTimeInitializerFactory);
-    }
-
-    public void setCompileTimeInitializer(
-            @Nullable NullableLazyValue<ConstantValue<?>> compileTimeInitializer,
-            @NotNull Function0<NullableLazyValue<ConstantValue<?>>> compileTimeInitializerFactory
-    ) {
-        assert !isVar() : "Constant value for variable initializer should be recorded only for final variables: " + getName();
-        this.compileTimeInitializerFactory = compileTimeInitializerFactory;
-        this.compileTimeInitializer = compileTimeInitializer != null ? compileTimeInitializer : compileTimeInitializerFactory.invoke();
-    }
-
-    @Override
-    public void cleanCompileTimeInitializerCache() {
-        this.compileTimeInitializer = compileTimeInitializerFactory.invoke();
+        this.compileTimeInitializer = compileTimeInitializer;
     }
 }

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt

@@ -132,12 +132,12 @@ class MemberDeserializer(private val c: DeserializationContext) {
         }
 
         if (Flags.HAS_CONSTANT.get(flags)) {
-            property.setCompileTimeInitializerFactory {
+            property.setCompileTimeInitializer(
                 c.storageManager.createNullableLazyValue {
                     val container = c.containingDeclaration.asProtoContainer()!!
                     c.components.annotationAndConstantLoader.loadPropertyConstant(container, proto, property.returnType)
                 }
-            }
+            )
         }
 
         if ((c.containingDeclaration as? ClassDescriptor)?.kind == ClassKind.ANNOTATION_CLASS) {