azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
-2
View File
@@ -410,8 +410,6 @@ 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
+6 -5
View File
@@ -114,9 +114,9 @@ class VariableTypeAndInitializerResolver(
trace: BindingTrace
) {
if (!variable.hasInitializer() || variable.isVar) return
variableDescriptor.setCompileTimeInitializerFactory {
variableDescriptor.setCompileTimeInitializer(
storageManager.createRecursionTolerantNullableLazyValue(
computeInitializer@{
computeInitializer@ {
if (!DescriptorUtils.shouldRecordInitializerForProperty(
variableDescriptor,
variableType
@@ -133,17 +133,18 @@ 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))
}
constant.toConstantValue(initializerType)
val qqq = constant.toConstantValue(initializerType)
qqq
},
null
)
}
)
}
private fun resolveDelegatedPropertyType(
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt
-9
View File
@@ -185,7 +185,6 @@ 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")
@@ -326,8 +325,6 @@ open class IrBasedVariableDescriptor(owner: IrVariable) : VariableDescriptor, Ir
TODO("")
}
override fun cleanCompileTimeInitializerCache() {}
override fun getOverriddenDescriptors(): Collection<VariableDescriptor> {
TODO("Not Implemented")
}
@@ -362,8 +359,6 @@ 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
@@ -833,8 +828,6 @@ open class IrBasedPropertyDescriptor(owner: IrProperty) :
return null
}
override fun cleanCompileTimeInitializerCache() {}
override fun isSetterProjectedOut(): Boolean {
TODO("not implemented")
}
@@ -1023,8 +1016,6 @@ 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
-1
View File
@@ -119,7 +119,6 @@ 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
-3
View File
@@ -76,8 +76,6 @@ abstract class IrDelegateDescriptorBase(
override fun getCompileTimeInitializer(): ConstantValue<*>? = null
override fun cleanCompileTimeInitializerCache() {}
override fun getVisibility(): DescriptorVisibility = DescriptorVisibilities.PRIVATE
override fun substitute(substitutor: TypeSubstitutor): PropertyDescriptor {
@@ -133,7 +131,6 @@ 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
-2
View File
@@ -65,8 +65,6 @@ open class FakeCallableDescriptorForObject(
override fun getCompileTimeInitializer() = null
override fun cleanCompileTimeInitializerCache() {}
override fun getSource(): SourceElement = classDescriptor.source
override fun isConst(): Boolean = false
core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaPropertyDescriptor.java
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
-5
View File
@@ -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
+3 -2
View File
@@ -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
-3
View File
@@ -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
+2 -18
View File
@@ -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
+2 -2
View File
@@ -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) {