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

Use double-checked locking in some reflection internals

Browse Source 
Note that `volatile` is not needed because in both cases we initialize
an object with a final field, which is subject to safe initialization.
This commit is contained in:
Alexander Udalov
2021-07-28 21:09:48 +02:00
parent e20b354dbd
commit 5f7803f2db
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaMember.kt
+3 -6
View File
@@ -24,7 +24,6 @@ import java.lang.reflect.AnnotatedElement
import java.lang.reflect.Member import java.lang.reflect.Member
import java.lang.reflect.Method import java.lang.reflect.Method
import java.lang.reflect.Type import java.lang.reflect.Type
import java.util.*
abstract class ReflectJavaMember : ReflectJavaElement(), ReflectJavaAnnotationOwner, ReflectJavaModifierListOwner, JavaMember { abstract class ReflectJavaMember : ReflectJavaElement(), ReflectJavaAnnotationOwner, ReflectJavaModifierListOwner, JavaMember {
abstract val member: Member abstract val member: Member
@@ -53,7 +52,7 @@ abstract class ReflectJavaMember : ReflectJavaElement(), ReflectJavaAnnotationOw
for (i in parameterTypes.indices) { for (i in parameterTypes.indices) {
val type = ReflectJavaType.create(parameterTypes[i]) val type = ReflectJavaType.create(parameterTypes[i])
val name = names?.run { val name = names?.run {
getOrNull(i + shift) ?: error("No parameter with index $i+$shift (name=$name type=$type) in $this@ReflectJavaMember") getOrNull(i + shift) ?: error("No parameter with index $i+$shift (name=$name type=$type) in ${this@ReflectJavaMember}")
} }
val isParamVararg = isVararg && i == parameterTypes.lastIndex val isParamVararg = isVararg && i == parameterTypes.lastIndex
result.add(ReflectJavaValueParameter(type, parameterAnnotations[i], name, isParamVararg)) result.add(ReflectJavaValueParameter(type, parameterAnnotations[i], name, isParamVararg))
@@ -89,10 +88,8 @@ private object Java8ParameterNamesLoader {
} }
fun loadParameterNames(member: Member): List<String>? { fun loadParameterNames(member: Member): List<String>? {
var cache = cache val cache = cache ?: synchronized(this) {
if (cache == null) { cache ?: buildCache(member).also { cache = it }
cache = buildCache(member)
this.cache = cache
} }
val getParameters = cache.getParameters ?: return null val getParameters = cache.getParameters ?: return null
core/reflection.jvm/src/kotlin/reflect/full/KAnnotatedElements.kt
+2 -4
View File
@@ -86,10 +86,8 @@ private object Java8RepeatableContainerLoader {
} }
fun loadRepeatableContainer(klass: Class<out Annotation>): Class<out Annotation>? { fun loadRepeatableContainer(klass: Class<out Annotation>): Class<out Annotation>? {
var cache = cache val cache = cache ?: synchronized(this) {
if (cache == null) { cache ?: buildCache().also { cache = it }
cache = buildCache()
this.cache = cache
} }
val repeatableClass = cache.repeatableClass ?: return null val repeatableClass = cache.repeatableClass ?: return null