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

Do not add special names to scopes even partially

Browse Source 
See 7a41d13b41
It's may be dangerous to call `addDescriptor` and then
not to add descriptor into the variablesAndClassifiersByName map
This commit is contained in:
Denis Zharkov
2016-10-14 12:04:42 +03:00
parent fe901e9516
commit 48c33333ee
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/LexicalScopeStorage.kt
+1 -2
View File
@@ -55,9 +55,8 @@ abstract class LexicalScopeStorage(
protected fun addVariableOrClassDescriptor(descriptor: DeclarationDescriptor) { protected fun addVariableOrClassDescriptor(descriptor: DeclarationDescriptor) {
val name = descriptor.name val name = descriptor.name
val descriptorIndex = addDescriptor(descriptor)
if (name.isSpecial) return if (name.isSpecial) return
val descriptorIndex = addDescriptor(descriptor)
if (variablesAndClassifiersByName == null) { if (variablesAndClassifiersByName == null) {
variablesAndClassifiersByName = HashMap() variablesAndClassifiersByName = HashMap()