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

[FIR] fix nested access to FirCache

Browse Source 
it's forbidden by the contract and causes ISE "Recursive update" or deadlock in the IDE
This commit is contained in:
Ilya Kirillov
2022-09-30 00:49:00 +02:00
parent e5a941030b
commit 9ac9bef20f
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt
+12 -9
View File
@@ -189,12 +189,7 @@ class FirSignatureEnhancement(
return original return original
} }
enhanceTypeParameterBounds(firMethod.typeParameters) enhanceTypeParameterBounds(firMethod.typeParameters)
return enhanceMethod(firMethod, original.callableId, name).also { enhancedVersion -> return enhanceMethod(firMethod, original.callableId, name)
val enhancedVersionFir = enhancedVersion.fir
(enhancedVersionFir.initialSignatureAttr as? FirSimpleFunction)?.let {
enhancedVersionFir.initialSignatureAttr = enhancedFunction(it.symbol, it.name).fir
}
}
} }
private fun enhanceMethod( private fun enhanceMethod(
@@ -563,9 +558,17 @@ class FirEnhancedSymbolsStorage(val session: FirSession) : FirSessionComponent {
class EnhancementSymbolsCache(cachesFactory: FirCachesFactory) { class EnhancementSymbolsCache(cachesFactory: FirCachesFactory) {
@OptIn(PrivateForInline::class) @OptIn(PrivateForInline::class)
val enhancedFunctions: FirCache<FirFunctionSymbol<*>, FirFunctionSymbol<*>, Pair<FirSignatureEnhancement, Name?>> = val enhancedFunctions: FirCache<FirFunctionSymbol<*>, FirFunctionSymbol<*>, Pair<FirSignatureEnhancement, Name?>> =
cachesFactory.createCache { original, (enhancement, name) -> cachesFactory.createCacheWithPostCompute(
enhancement.enhance(original, name) createValue = { original, (enhancement, name) ->
} enhancement.enhance(original, name) to enhancement
},
postCompute = { _, enhancedVersion, enhancement ->
val enhancedVersionFir = enhancedVersion.fir
(enhancedVersionFir.initialSignatureAttr as? FirSimpleFunction)?.let {
enhancedVersionFir.initialSignatureAttr = enhancement.enhancedFunction(it.symbol, it.name).fir
}
}
)
@OptIn(PrivateForInline::class) @OptIn(PrivateForInline::class)
val enhancedVariables: FirCache<FirVariableSymbol<*>, FirVariableSymbol<*>, Pair<FirSignatureEnhancement, Name>> = val enhancedVariables: FirCache<FirVariableSymbol<*>, FirVariableSymbol<*>, Pair<FirSignatureEnhancement, Name>> =