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

FIR IDE: fix deadlock in symbol providers

Browse Source
This commit is contained in:
Ilya Kirillov
2021-04-04 17:38:26 +02:00
parent 266daed2cb
commit 790cafa671
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/fir/caches/FirThreadSafeCache.kt
+1 -1
View File
@@ -14,7 +14,7 @@ internal class FirThreadSafeCache<K : Any, V, CONTEXT>(
private val map = ConcurrentHashMap<K, Any>() private val map = ConcurrentHashMap<K, Any>()
override fun getValue(key: K, context: CONTEXT): V = override fun getValue(key: K, context: CONTEXT): V =
map.computeIfAbsentWithNullableValue(key) { createValue(it, context) } map.getOrPutWithNullableValue(key) { createValue(it, context) }
override fun getValueIfComputed(key: K): V? = override fun getValueIfComputed(key: K): V? =
map[key]?.nullValueToNull() map[key]?.nullValueToNull()
idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/fir/caches/FirThreadSafeCacheWithPostCompute.kt
+1 -1
View File
@@ -16,7 +16,7 @@ internal class FirThreadSafeCacheWithPostCompute<K : Any, V, CONTEXT, DATA>(
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
override fun getValue(key: K, context: CONTEXT): V = override fun getValue(key: K, context: CONTEXT): V =
map.computeIfAbsent(key) { map.getOrPut(key) {
ValueWithPostCompute( ValueWithPostCompute(
key, key,
calculate = { createValue(it, context) }, calculate = { createValue(it, context) },
idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/fir/caches/NullValue.kt
+2 -2
View File
@@ -15,10 +15,10 @@ internal inline fun <VALUE> Any.nullValueToNull(): VALUE = when (this) {
else -> this else -> this
} as VALUE } as VALUE
internal inline fun <KEY : Any, RESULT> ConcurrentMap<KEY, Any>.computeIfAbsentWithNullableValue( internal inline fun <KEY : Any, RESULT> ConcurrentMap<KEY, Any>.getOrPutWithNullableValue(
key: KEY, key: KEY,
crossinline compute: (KEY) -> Any? crossinline compute: (KEY) -> Any?
): RESULT { ): RESULT {
val value = computeIfAbsent(key) { k -> compute(k) ?: NullValue } val value = getOrPut(key) { compute(key) ?: NullValue }
return value.nullValueToNull() return value.nullValueToNull()
} }