diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt index 73ff4ecb25f..cd20c325926 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt @@ -88,13 +88,6 @@ public class WritableScopeImpl(override val workerScope: JetScope, return result } - private fun getLabelsToDescriptors(): MutableMap> { - if (labelsToDescriptors == null) { - labelsToDescriptors = HashMap() - } - return labelsToDescriptors!! - } - override fun getDeclarationsByLabel(labelName: Name): Collection { checkMayRead() @@ -107,10 +100,10 @@ public class WritableScopeImpl(override val workerScope: JetScope, override fun addLabeledDeclaration(descriptor: DeclarationDescriptor) { checkMayWrite() - val labelsToDescriptors = getLabelsToDescriptors() - val name = descriptor.getName() - var declarationDescriptors = labelsToDescriptors.getOrPut(name) { ArrayList() } - declarationDescriptors.add(descriptor) + if (labelsToDescriptors == null) { + labelsToDescriptors = HashMap() + } + labelsToDescriptors!!.getOrPut(descriptor.getName()) { ArrayList(1) }.add(descriptor) } private fun addVariableOrClassDescriptor(descriptor: DeclarationDescriptor) {