From ebc2ea59cde73c2a022a3c3b8204c4b04ec8f5f2 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 22 Sep 2020 12:30:18 +0300 Subject: [PATCH] FIR IDE: introduce WeakFirRef for low level --- .../low/level/api/annotations/annotations.kt | 10 +++++++ .../idea/fir/low/level/api/api/WeakFirRef.kt | 28 +++++++++++++++++++ .../frontend/api/fir/symbols/KtFirSymbol.kt | 4 +-- .../{FirRef.kt => FirRefWithValidityCheck.kt} | 4 +-- 4 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/annotations/annotations.kt create mode 100644 idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/WeakFirRef.kt rename idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/{FirRef.kt => FirRefWithValidityCheck.kt} (90%) diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/annotations/annotations.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/annotations/annotations.kt new file mode 100644 index 00000000000..ec2049e2fbc --- /dev/null +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/annotations/annotations.kt @@ -0,0 +1,10 @@ +/* + * 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.idea.fir.low.level.api.annotations + +@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION) +@RequiresOptIn +annotation class PrivateForInline \ No newline at end of file diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/WeakFirRef.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/WeakFirRef.kt new file mode 100644 index 00000000000..6ecdd380ddc --- /dev/null +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/WeakFirRef.kt @@ -0,0 +1,28 @@ +/* + * 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.idea.fir.low.level.api.api + +import org.jetbrains.kotlin.fir.declarations.FirDeclaration +import org.jetbrains.kotlin.fir.declarations.FirResolvePhase +import org.jetbrains.kotlin.idea.fir.low.level.api.annotations.PrivateForInline +import java.lang.ref.WeakReference + +class WeakFirRef(fir: D, resolveState: FirModuleResolveState) { + @PrivateForInline + val firWeakRef = WeakReference(fir) + + @PrivateForInline + val resolveStateWeakRef = WeakReference(resolveState) + + @OptIn(PrivateForInline::class) + inline fun withFir(phase: FirResolvePhase = FirResolvePhase.RAW_FIR, action: (fir: D) -> R): R { + val fir = firWeakRef.get() + ?: error("FirElement was garbage collected") + val resolveState = resolveStateWeakRef.get() + ?: error("FirModuleResolveState was garbage collected") + return action(LowLevelFirApiFacade.resolvedFirToPhase(fir, phase, resolveState)) + } +} \ No newline at end of file diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbol.kt index e38126e59c1..f08f9ef54ea 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbol.kt @@ -8,13 +8,13 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.symbols import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner -import org.jetbrains.kotlin.idea.frontend.api.fir.utils.FirRef +import org.jetbrains.kotlin.idea.frontend.api.fir.utils.FirRefWithValidityCheck import org.jetbrains.kotlin.idea.frontend.api.fir.utils.overriddenDeclaration import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbolOrigin internal interface KtFirSymbol : KtSymbol, ValidityTokenOwner { - val firRef: FirRef + val firRef: FirRefWithValidityCheck override val origin: KtSymbolOrigin get() = firRef.withFir { it.ktSymbolOrigin() } } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/FirRef.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/FirRefWithValidityCheck.kt similarity index 90% rename from idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/FirRef.kt rename to idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/FirRefWithValidityCheck.kt index 5241913fd1a..6351619e08f 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/FirRef.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/FirRefWithValidityCheck.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner import org.jetbrains.kotlin.idea.frontend.api.assertIsValid import java.lang.ref.WeakReference -internal class FirRef(fir: D, resolveState: FirModuleResolveState, val token: ValidityToken) { +internal class FirRefWithValidityCheck(fir: D, resolveState: FirModuleResolveState, val token: ValidityToken) { private val firWeakRef = WeakReference(fir) private val resolveStateWeakRef = WeakReference(resolveState) @@ -34,4 +34,4 @@ internal class FirRef(fir: D, resolveState: FirModuleResolve @Suppress("NOTHING_TO_INLINE") internal inline fun ValidityTokenOwner.firRef(fir: D, resolveState: FirModuleResolveState) = - FirRef(fir, resolveState, token) \ No newline at end of file + FirRefWithValidityCheck(fir, resolveState, token) \ No newline at end of file