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

don't create resolve tasks with lists of candidates which are known to be empty

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-06-02 17:20:59 +02:00
parent 365d45f49e
commit 4d5c785944
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTaskHolder.kt
+3 -1
View File
@@ -40,7 +40,9 @@ public class ResolutionTaskHolder<D : CallableDescriptor, F : D>(
public fun addCandidates(candidatesList: List<Collection<ResolutionCandidate<D>>>) {
assertNotFinished()
for (candidates in candidatesList) {
addCandidates { candidates }
if (candidates.isNotEmpty()) {
addCandidates { candidates }
}
}
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TaskPrioritizer.kt
+8 -7
View File
@@ -70,7 +70,7 @@ public class TaskPrioritizer(private val storageManager: StorageManager) {
val taskPrioritizerContext = TaskPrioritizerContext(name, result, context, context.scope, callableDescriptorCollectors)
if (explicitReceiver is QualifierReceiver) {
val qualifierReceiver = explicitReceiver : QualifierReceiver
val qualifierReceiver: QualifierReceiver = explicitReceiver
doComputeTasks(NO_RECEIVER, taskPrioritizerContext.replaceScope(qualifierReceiver.getNestedClassesAndPackageMembersScope()))
computeTasksForClassObjectReceiver(qualifierReceiver, taskPrioritizerContext)
}
@@ -252,13 +252,14 @@ public class TaskPrioritizer(private val storageManager: StorageManager) {
c.context.call
)
val nonlocals = Lists.newArrayList<ResolutionCandidate<D>>()
val locals = Lists.newArrayList<ResolutionCandidate<D>>()
//noinspection unchecked,RedundantTypeArguments
splitLexicallyLocalDescriptors(members, c.scope.getContainingDeclaration(), locals, nonlocals)
if (members.isNotEmpty()) {
val nonlocals = Lists.newArrayList<ResolutionCandidate<D>>()
val locals = Lists.newArrayList<ResolutionCandidate<D>>()
splitLexicallyLocalDescriptors(members, c.scope.getContainingDeclaration(), locals, nonlocals)
localsList.add(locals)
nonlocalsList.add(nonlocals)
localsList.add(locals)
nonlocalsList.add(nonlocals)
}
}
//locals