FIR IDE: wrap KotlinDeserializedJvmSymbolsProvider into thread safe cache
This is needed by the two reasons: - KotlinDeserializedJvmSymbolsProvider does not cache all symbols by itself and as KtSymbol's holds fir elements under via weak refs, this weak refs may be garbage collected - KotlinDeserializedJvmSymbolsProvider is not thread safe
This commit is contained in:
+1
-1
@@ -5,6 +5,6 @@
|
||||
|
||||
package org.jetbrains.kotlin.idea.fir.low.level.api.annotations
|
||||
|
||||
@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION, AnnotationTarget.CONSTRUCTOR)
|
||||
@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.CLASS)
|
||||
@RequiresOptIn
|
||||
annotation class PrivateForInline
|
||||
+69
@@ -0,0 +1,69 @@
|
||||
/*
|
||||
* 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.providers
|
||||
|
||||
import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider
|
||||
import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProviderInternals
|
||||
import org.jetbrains.kotlin.fir.symbols.CallableId
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol
|
||||
import org.jetbrains.kotlin.idea.fir.low.level.api.annotations.PrivateForInline
|
||||
import org.jetbrains.kotlin.name.ClassId
|
||||
import org.jetbrains.kotlin.name.FqName
|
||||
import org.jetbrains.kotlin.name.Name
|
||||
import java.util.concurrent.locks.ReadWriteLock
|
||||
import java.util.concurrent.locks.ReentrantReadWriteLock
|
||||
import kotlin.concurrent.withLock
|
||||
|
||||
internal class FirThreadSafeSymbolProviderWrapper(private val provider: FirSymbolProvider) : FirSymbolProvider(provider.session) {
|
||||
private val lock = ReentrantReadWriteLock()
|
||||
private val classesCache = ThreadSafeCache<ClassId, FirClassLikeSymbol<*>>(lock)
|
||||
private val topLevelCache = ThreadSafeCache<CallableId, List<FirCallableSymbol<*>>>(lock)
|
||||
private val packages = ThreadSafeCache<FqName, FqName>(lock)
|
||||
|
||||
override fun getClassLikeSymbolByFqName(classId: ClassId): FirClassLikeSymbol<*>? =
|
||||
classesCache.getOrCompute(classId) {
|
||||
provider.getClassLikeSymbolByFqName(classId)
|
||||
}
|
||||
|
||||
override fun getTopLevelCallableSymbols(packageFqName: FqName, name: Name): List<FirCallableSymbol<*>> =
|
||||
topLevelCache.getOrCompute(CallableId(packageFqName, name)) {
|
||||
provider.getTopLevelCallableSymbols(packageFqName, name)
|
||||
} ?: emptyList()
|
||||
|
||||
@FirSymbolProviderInternals
|
||||
override fun getTopLevelCallableSymbolsTo(destination: MutableList<FirCallableSymbol<*>>, packageFqName: FqName, name: Name) {
|
||||
error("Should not be called for wrapper")
|
||||
}
|
||||
|
||||
override fun getPackage(fqName: FqName): FqName? =
|
||||
packages.getOrCompute(fqName) { provider.getPackage(fqName) }
|
||||
}
|
||||
|
||||
private class ThreadSafeCache<KEY, VALUE : Any>(private val lock: ReadWriteLock) {
|
||||
private val map = HashMap<KEY, Any>()
|
||||
|
||||
@OptIn(PrivateForInline::class)
|
||||
inline fun getOrCompute(key: KEY, compute: () -> VALUE?): VALUE? {
|
||||
var value = lock.readLock().withLock { map[key] }
|
||||
if (value == null) {
|
||||
lock.writeLock().withLock {
|
||||
value = compute() ?: NULLABLE_VALUE
|
||||
map[key] = value!!
|
||||
}
|
||||
}
|
||||
@Suppress("UNCHECKED_CAST")
|
||||
return when (value) {
|
||||
NULLABLE_VALUE -> null
|
||||
null -> error("We should not read null from map here")
|
||||
else -> value as VALUE
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Suppress("ClassName")
|
||||
@PrivateForInline
|
||||
internal object NULLABLE_VALUE
|
||||
+11
-8
@@ -38,6 +38,7 @@ import org.jetbrains.kotlin.idea.fir.low.level.api.lazy.resolve.FirLazyDeclarati
|
||||
import org.jetbrains.kotlin.idea.fir.low.level.api.providers.FirModuleWithDependenciesSymbolProvider
|
||||
import org.jetbrains.kotlin.idea.fir.low.level.api.providers.FirIdeProvider
|
||||
import org.jetbrains.kotlin.idea.fir.low.level.api.sessions.FirIdeSessionFactory.registerIdeComponents
|
||||
import org.jetbrains.kotlin.idea.fir.low.level.api.providers.FirThreadSafeSymbolProviderWrapper
|
||||
import org.jetbrains.kotlin.idea.fir.low.level.api.util.ModuleLibrariesSearchScope
|
||||
import org.jetbrains.kotlin.idea.fir.low.level.api.util.checkCanceled
|
||||
import org.jetbrains.kotlin.load.java.JavaClassFinderImpl
|
||||
@@ -160,14 +161,16 @@ internal object FirIdeSessionFactory {
|
||||
this,
|
||||
buildList {
|
||||
add(
|
||||
KotlinDeserializedJvmSymbolsProvider(
|
||||
this@apply,
|
||||
project,
|
||||
packagePartProvider,
|
||||
javaSymbolProvider,
|
||||
kotlinClassFinder,
|
||||
javaClassFinder,
|
||||
kotlinScopeProvider
|
||||
FirThreadSafeSymbolProviderWrapper(
|
||||
KotlinDeserializedJvmSymbolsProvider(
|
||||
this@apply,
|
||||
project,
|
||||
packagePartProvider,
|
||||
javaSymbolProvider,
|
||||
kotlinClassFinder,
|
||||
javaClassFinder,
|
||||
kotlinScopeProvider
|
||||
)
|
||||
)
|
||||
)
|
||||
add(javaSymbolProvider)
|
||||
|
||||
Reference in New Issue
Block a user