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

This reverts commit faeb5d21ab.

compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt

@@ -410,6 +410,8 @@ class TypeResolver(
 
                     override fun getCompileTimeInitializer() = null
 
+                    override fun cleanCompileTimeInitializerCache() {}
+
                     override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>, data: D): R {
                         return visitor.visitVariableDescriptor(this, data)
                     }

compiler/frontend/src/org/jetbrains/kotlin/resolve/VariableTypeAndInitializerResolver.kt

@@ -114,9 +114,9 @@ class VariableTypeAndInitializerResolver(
         trace: BindingTrace
     ) {
         if (!variable.hasInitializer() || variable.isVar) return
-        variableDescriptor.setCompileTimeInitializer(
+        variableDescriptor.setCompileTimeInitializerFactory {
             storageManager.createRecursionTolerantNullableLazyValue(
-                computeInitializer@ {
+                computeInitializer@{
                     if (!DescriptorUtils.shouldRecordInitializerForProperty(
                             variableDescriptor,
                             variableType
@@ -133,18 +133,17 @@ class VariableTypeAndInitializerResolver(
                         constantExpressionEvaluator.module
                     )
                     val constant = constantExpressionEvaluator.evaluateExpression(initializer, trace, initializerType)
-                            ?: return@computeInitializer null
+                        ?: return@computeInitializer null
 
                     if (constant.usesNonConstValAsConstant && variableDescriptor.isConst) {
                         trace.report(Errors.NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION.on(initializer))
                     }
 
-                    val qqq = constant.toConstantValue(initializerType)
-                    qqq
+                    constant.toConstantValue(initializerType)
                 },
                 null
             )
-        )
+        }
     }
 
     private fun resolveDelegatedPropertyType(

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt

@@ -185,6 +185,7 @@ open class IrBasedValueParameterDescriptor(owner: IrValueParameter) : ValueParam
     override fun getName() = owner.name
     override fun declaresDefaultValue() = owner.defaultValue != null
     override fun getCompileTimeInitializer(): ConstantValue<*>? = null
+    override fun cleanCompileTimeInitializerCache() {}
 
     override fun copy(newOwner: CallableDescriptor, newName: Name, newIndex: Int) = TODO("not implemented")
 
@@ -325,6 +326,8 @@ open class IrBasedVariableDescriptor(owner: IrVariable) : VariableDescriptor, Ir
         TODO("")
     }
 
+    override fun cleanCompileTimeInitializerCache() {}
+
     override fun getOverriddenDescriptors(): Collection<VariableDescriptor> {
         TODO("Not Implemented")
     }
@@ -359,6 +362,8 @@ open class IrBasedVariableDescriptorWithAccessor(owner: IrLocalDelegatedProperty
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
+    override fun cleanCompileTimeInitializerCache() {}
+
     override fun getType(): KotlinType = owner.type.toIrBasedKotlinType()
 
     override fun isConst(): Boolean = false
@@ -828,6 +833,8 @@ open class IrBasedPropertyDescriptor(owner: IrProperty) :
         return null
     }
 
+    override fun cleanCompileTimeInitializerCache() {}
+
     override fun isSetterProjectedOut(): Boolean {
         TODO("not implemented")
     }
@@ -1016,6 +1023,8 @@ open class IrBasedFieldDescriptor(owner: IrField) : PropertyDescriptor, IrBasedD
         TODO("not implemented")
     }
 
+    override fun cleanCompileTimeInitializerCache() {}
+
     override fun isSetterProjectedOut(): Boolean {
         TODO("not implemented")
     }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltinFunctionDescriptor.kt

@@ -119,6 +119,7 @@ class IrBuiltinValueParameterDescriptorImpl(
     override val isNoinline: Boolean get() = false
     override val varargElementType: KotlinType? get() = null
     override fun getCompileTimeInitializer(): ConstantValue<*>? = null
+    override fun cleanCompileTimeInitializerCache() {}
     override fun isVar(): Boolean = false
     override fun getVisibility(): DescriptorVisibility = DescriptorVisibilities.LOCAL
 

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrDelegateDescriptor.kt

@@ -76,6 +76,8 @@ abstract class IrDelegateDescriptorBase(
 
     override fun getCompileTimeInitializer(): ConstantValue<*>? = null
 
+    override fun cleanCompileTimeInitializerCache() {}
+
     override fun getVisibility(): DescriptorVisibility = DescriptorVisibilities.PRIVATE
 
     override fun substitute(substitutor: TypeSubstitutor): PropertyDescriptor {
@@ -131,6 +133,7 @@ class IrLocalDelegatedPropertyDelegateDescriptorImpl(
     ) {
 
     override fun getCompileTimeInitializer(): ConstantValue<*>? = null
+    override fun cleanCompileTimeInitializerCache() {}
     override fun isVar(): Boolean = false
     override fun isLateInit(): Boolean = false
     override fun substitute(substitutor: TypeSubstitutor): VariableDescriptor? = throw UnsupportedOperationException()

compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/util/FakeCallableDescriptorForObject.kt

@@ -65,6 +65,8 @@ open class FakeCallableDescriptorForObject(
 
     override fun getCompileTimeInitializer() = null
 
+    override fun cleanCompileTimeInitializerCache() {}
+
     override fun getSource(): SourceElement = classDescriptor.source
 
     override fun isConst(): Boolean = false