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

Fix deadlock in StaticScopeForKotlinEnum

Browse Source 
Also fix possible deadlock in ReflectionTypes

 #KT-11869 Fixed
This commit is contained in:
Alexander Udalov
2016-04-12 16:24:11 +03:00
parent a8629b3836
commit 11d875ca17
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
+1 -1
View File
@@ -62,7 +62,7 @@ class DeserializedClassDescriptor(
private val classId = nameResolver.getClassId(classProto.fqName)
private val staticScope = if (kind == ClassKind.ENUM_CLASS) StaticScopeForKotlinEnum(this) else MemberScope.Empty
private val staticScope = if (kind == ClassKind.ENUM_CLASS) StaticScopeForKotlinEnum(c.storageManager, this) else MemberScope.Empty
private val typeConstructor = DeserializedClassTypeConstructor()
private val memberScope = DeserializedClassMemberScope()
private val nestedClasses = NestedClassDescriptors()