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

FIR: make TypeRegistry thread safe

Browse Source
This commit is contained in:
Ilya Kirillov
2020-07-30 17:36:27 +03:00
parent 5f424ed1ec
commit b41a5f9f34
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/ArrayMapOwner.kt
+6 -2
View File
@@ -6,6 +6,8 @@
package org.jetbrains.kotlin.fir.utils package org.jetbrains.kotlin.fir.utils
import java.util.* import java.util.*
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.atomic.AtomicInteger
import kotlin.properties.ReadOnlyProperty import kotlin.properties.ReadOnlyProperty
import kotlin.reflect.KClass import kotlin.reflect.KClass
import kotlin.reflect.KProperty import kotlin.reflect.KProperty
@@ -52,7 +54,9 @@ class NullableArrayMapAccessor<K : Any, V : Any, T : V>(
} }
abstract class TypeRegistry<K : Any, V : Any> { abstract class TypeRegistry<K : Any, V : Any> {
private val idPerType = HashMap<KClass<out K>, Int>() private val idPerType = ConcurrentHashMap<KClass<out K>, Int>()
private val idCounter = AtomicInteger(0)
fun <T : V, KK : K> generateAccessor(kClass: KClass<KK>): ArrayMapAccessor<K, V, T> { fun <T : V, KK : K> generateAccessor(kClass: KClass<KK>): ArrayMapAccessor<K, V, T> {
return ArrayMapAccessor(kClass, getId(kClass)) return ArrayMapAccessor(kClass, getId(kClass))
@@ -63,7 +67,7 @@ abstract class TypeRegistry<K : Any, V : Any> {
} }
fun <T : K> getId(kClass: KClass<T>): Int { fun <T : K> getId(kClass: KClass<T>): Int {
return idPerType.getOrPut(kClass) { idPerType.size } return idPerType.computeIfAbsent(kClass) { idCounter.getAndIncrement() }
} }
protected val indices: Collection<Int> protected val indices: Collection<Int>