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

[LL FIR] always use lockWithPCECheck for resolve to check possible PCE

Browse Source
This commit is contained in:
Ilya Kirillov
2022-12-13 13:52:21 +01:00
committed by Space Team
parent d7ee312b83
commit c80221afd3
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticRetriever.kt
+1 -1
View File
@@ -34,7 +34,7 @@ internal class SingleNonLocalDeclarationDiagnosticRetriever(
moduleComponents: LLFirModuleResolveComponents,
): FileStructureElementDiagnosticList {
val sessionHolder = SessionHolderImpl(moduleComponents.session, moduleComponents.scopeSessionProvider.getScopeSession())
val context = moduleComponents.globalResolveComponents.lockProvider.withWriteLock(firFile) {
val context = moduleComponents.globalResolveComponents.lockProvider.withLock(firFile) {
PersistenceContextCollector.collectContext(sessionHolder, firFile, structureElementDeclaration)
}
return withSourceCodeAnalysisExceptionUnwrapping {
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/LLFirLockProvider.kt
+9 -8
View File
@@ -8,25 +8,26 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder
import org.jetbrains.kotlin.analysis.low.level.api.fir.util.lockWithPCECheck
import org.jetbrains.kotlin.fir.declarations.FirFile
import java.util.concurrent.locks.ReentrantLock
import kotlin.concurrent.withLock
/**
* Keyed locks provider.
*/
internal class LLFirLockProvider {
//We temporarily disable multi-locks to fix deadlocks problem
private val globalLock = ReentrantLock()
inline fun <R> withWriteLock(@Suppress("UNUSED_PARAMETER") key: FirFile, action: () -> R): R {
return globalLock.withLock { action() }
}
inline fun <R> withWriteLockPCECheck(@Suppress("UNUSED_PARAMETER") key: FirFile, lockingIntervalMs: Long, action: () -> R): R {
inline fun <R> withLock(
@Suppress("UNUSED_PARAMETER") key: FirFile,
lockingIntervalMs: Long = DEFAULT_LOCKING_INTERVAL,
action: () -> R
): R {
return globalLock.lockWithPCECheck(lockingIntervalMs) { action() }
}
}
private const val DEFAULT_LOCKING_INTERVAL = 50L
/**
* Runs [resolve] function (which is considered to do some resolve on [firFile]) under a lock for [firFile]
*/
@@ -34,5 +35,5 @@ internal inline fun <R> LLFirLockProvider.runCustomResolveUnderLock(
firFile: FirFile,
body: () -> R
): R {
return withWriteLockPCECheck(key = firFile, lockingIntervalMs = 50L, body)
return withLock(key = firFile, lockingIntervalMs = DEFAULT_LOCKING_INTERVAL, body)
}
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructureElement.kt
+2 -2
View File
@@ -115,7 +115,7 @@ internal class ReanalyzableFunctionStructureElement(
rootNonLocalDeclaration = newKtDeclaration,
) as FirSimpleFunction
return moduleComponents.globalResolveComponents.lockProvider.withWriteLock(firFile) {
return moduleComponents.globalResolveComponents.lockProvider.withLock(firFile) {
val upgradedPhase = minOf(originalFunction.resolvePhase, FirResolvePhase.DECLARATIONS)
moduleComponents.sessionInvalidator.withInvalidationOnException(moduleComponents.session) {
@@ -162,7 +162,7 @@ internal class ReanalyzablePropertyStructureElement(
rootNonLocalDeclaration = newKtDeclaration,
) as FirProperty
return moduleComponents.globalResolveComponents.lockProvider.withWriteLock(firFile) {
return moduleComponents.globalResolveComponents.lockProvider.withLock(firFile) {
val getterPhase = originalProperty.getter?.resolvePhase ?: originalProperty.resolvePhase
val setterPhase = originalProperty.setter?.resolvePhase ?: originalProperty.resolvePhase
val upgradedPhase = minOf(originalProperty.resolvePhase, getterPhase, setterPhase, FirResolvePhase.DECLARATIONS)