[Analysis API fir] remove now unneeded ReadOnlyWeakRef

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirBuiltInTypes.kt

@@ -5,20 +5,22 @@
 
 package org.jetbrains.kotlin.analysis.api.fir.components
 
-import org.jetbrains.kotlin.fir.BuiltinTypes
-import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
-import org.jetbrains.kotlin.fir.types.impl.FirImplicitBuiltinTypeRef
-import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
 import org.jetbrains.kotlin.analysis.api.components.KtBuiltinTypes
 import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder
 import org.jetbrains.kotlin.analysis.api.fir.types.KtFirUsualClassType
 import org.jetbrains.kotlin.analysis.api.fir.utils.ValidityAwareCachedValue
 import org.jetbrains.kotlin.analysis.api.fir.utils.cached
-import org.jetbrains.kotlin.analysis.api.fir.utils.weakRef
+import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
 import org.jetbrains.kotlin.analysis.api.types.KtType
+import org.jetbrains.kotlin.fir.BuiltinTypes
+import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
+import org.jetbrains.kotlin.fir.types.impl.FirImplicitBuiltinTypeRef
 
-internal class KtFirBuiltInTypes(builtinTypes: BuiltinTypes, builder: KtSymbolByFirBuilder, override val token: KtLifetimeToken) : KtBuiltinTypes() {
-    private val builder by weakRef(builder)
+internal class KtFirBuiltInTypes(
+    builtinTypes: BuiltinTypes,
+    private val builder: KtSymbolByFirBuilder,
+    override val token: KtLifetimeToken
+) : KtBuiltinTypes() {
 
     override val INT: KtType by cachedBuiltin(builtinTypes.intType)
     override val LONG: KtType by cachedBuiltin(builtinTypes.longType)
@@ -41,6 +43,6 @@ internal class KtFirBuiltInTypes(builtinTypes: BuiltinTypes, builder: KtSymbolBy
     override val NULLABLE_NOTHING: KtType by cachedBuiltin(builtinTypes.nullableNothingType)
 
     private fun cachedBuiltin(builtinTypeRef: FirImplicitBuiltinTypeRef): ValidityAwareCachedValue<KtFirUsualClassType> = cached {
-        KtFirUsualClassType(builtinTypeRef.type as ConeClassLikeTypeImpl, token, builder) // TODO builder leaking
+        KtFirUsualClassType(builtinTypeRef.type as ConeClassLikeTypeImpl, token, builder)
     }
 }

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirReceiverParameterSymbol.kt

@@ -10,7 +10,6 @@ import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeOwner
 import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder
 import org.jetbrains.kotlin.analysis.api.fir.findPsi
 import org.jetbrains.kotlin.analysis.api.fir.utils.cached
-import org.jetbrains.kotlin.analysis.api.fir.utils.weakRef
 import org.jetbrains.kotlin.analysis.api.symbols.KtReceiverParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
@@ -24,7 +23,7 @@ internal class KtFirReceiverParameterSymbol(
     val firSymbol: FirCallableSymbol<*>,
     val firResolveSession: LLFirResolveSession,
     override val token: KtLifetimeToken,
-    _builder: KtSymbolByFirBuilder
+    private val builder: KtSymbolByFirBuilder
 ) : KtReceiverParameterSymbol(), KtLifetimeOwner {
     override val psi: PsiElement? by cached { firSymbol.fir.receiverTypeRef?.findPsi(firSymbol.fir.moduleData.session) }
 
@@ -32,8 +31,6 @@ internal class KtFirReceiverParameterSymbol(
         require(firSymbol.fir.receiverTypeRef != null) { "$firSymbol doesn't have an extension receiver." }
     }
 
-    private val builder by weakRef(_builder)
-
     override val type: KtType by cached {
         firSymbol.receiverType(builder)
             ?: error("$firSymbol doesn't have an extension receiver.")

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/types/KtFirSubstitutor.kt

@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.analysis.api.fir.types
 
 import org.jetbrains.kotlin.analysis.api.KtAnalysisApiInternals
 import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder
-import org.jetbrains.kotlin.analysis.api.fir.utils.weakRef
 import org.jetbrains.kotlin.analysis.api.impl.base.KtMapBackedSubstitutor
 import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol
 import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
@@ -18,37 +17,35 @@ import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutorByMap
 
 internal abstract class AbstractKtFirSubstitutor<T : ConeSubstitutor>(
-    private val _substitutor: T,
-    builder: KtSymbolByFirBuilder,
+    val substitutor: T,
+    protected val builder: KtSymbolByFirBuilder,
     override val token: KtLifetimeToken,
 ) : KtSubstitutor {
-    protected val builderRef by weakRef(builder)
-    val substitutor: T get() = withValidityAssertion { _substitutor }
 
     override fun substituteOrNull(type: KtType): KtType? = withValidityAssertion {
         require(type is KtFirType)
-        substitutor.substituteOrNull(type.coneType)?.type?.let { builderRef.typeBuilder.buildKtType(it) }
+        substitutor.substituteOrNull(type.coneType)?.type?.let { builder.typeBuilder.buildKtType(it) }
     }
 }
 
 internal class KtFirGenericSubstitutor(
-    _substitutor: ConeSubstitutor,
+    substitutor: ConeSubstitutor,
     builder: KtSymbolByFirBuilder,
     token: KtLifetimeToken
-) : AbstractKtFirSubstitutor<ConeSubstitutor>(_substitutor, builder, token)
+) : AbstractKtFirSubstitutor<ConeSubstitutor>(substitutor, builder, token)
 
 @OptIn(KtAnalysisApiInternals::class)
 internal class KtFirMapBackedSubstitutor(
-    _substitutor: ConeSubstitutorByMap,
+    substitutor: ConeSubstitutorByMap,
     builder: KtSymbolByFirBuilder,
     token: KtLifetimeToken
-) : AbstractKtFirSubstitutor<ConeSubstitutorByMap>(_substitutor, builder, token), KtMapBackedSubstitutor {
+) : AbstractKtFirSubstitutor<ConeSubstitutorByMap>(substitutor, builder, token), KtMapBackedSubstitutor {
     override fun getAsMap(): Map<KtTypeParameterSymbol, KtType> = withValidityAssertion {
         val result = mutableMapOf<KtTypeParameterSymbol, KtType>()
         for ((typeParameter, type) in substitutor.substitution) {
-            val typeParameterSymbol = builderRef.classifierBuilder.buildTypeParameterSymbolByLookupTag(typeParameter.toLookupTag())
+            val typeParameterSymbol = builder.classifierBuilder.buildTypeParameterSymbolByLookupTag(typeParameter.toLookupTag())
             if (typeParameterSymbol != null) {
-                result[typeParameterSymbol] = builderRef.typeBuilder.buildKtType(type)
+                result[typeParameterSymbol] = builder.typeBuilder.buildKtType(type)
             }
         }
 

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/LazyOnlyWeakRef.kt

@@ -1,31 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.analysis.api.fir.utils
-
-import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeOwner
-import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
-import java.lang.ref.WeakReference
-import kotlin.reflect.KProperty
-
-class ReadOnlyWeakRef<V : Any>
-@Deprecated("Consider using KtLifetimeTokenOwner.weakRef instead")
-constructor(value: V, val token: KtLifetimeToken) {
-    val weakRef = WeakReference(value)
-
-    @Suppress("NOTHING_TO_INLINE")
-    inline operator fun getValue(thisRef: Any, property: KProperty<*>): V =
-        weakRef.get() ?: if (token.isValid()) {
-            throw EntityWasGarbageCollectedException(property.toString())
-        } else {
-            error("Accessing the invalid value of $property")
-        }
-}
-
-@Suppress("NOTHING_TO_INLINE", "DEPRECATION")
-internal inline fun <V : Any> KtLifetimeOwner.weakRef(value: V) = ReadOnlyWeakRef(value, token)
-
-@Suppress("DEPRECATION")
-internal inline fun <V : Any> KtLifetimeOwner.weakRef(value: () -> V) = ReadOnlyWeakRef(value(), token)