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

This reverts commit 0e6762acc3.
This commit is contained in:
Nikolay Krasko
2021-12-10 14:17:00 +03:00
committed by TeamCityServer
parent 965bab2d2d
commit faeb5d21ab
13 changed files with 17 additions and 56 deletions
@@ -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());
@@ -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)