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

Use SmartList instead of SmartSet for overridden descriptors

Browse Source 
SmartSet was used because it was the only lightweight collection
available in core, but now there is org.jetbrains.kotlin.utils.SmartList
This commit is contained in:
Denis Zharkov
2017-05-24 13:01:30 +03:00
parent 729f20ed81
commit 8576054788
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java
+6 -7
View File
@@ -25,8 +25,7 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationsKt;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.resolve.DescriptorFactory;
import org.jetbrains.kotlin.types.*;
import kotlin.collections.CollectionsKt;
import org.jetbrains.kotlin.utils.SmartSet;
import org.jetbrains.kotlin.utils.SmartList;
import java.util.*;
@@ -54,7 +53,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
private boolean hasStableParameterNames = true;
private boolean hasSynthesizedParameterNames = false;
private Collection<? extends FunctionDescriptor> overriddenFunctions = null;
private volatile Function0<Set<FunctionDescriptor>> lazyOverriddenFunctionsTask = null;
private volatile Function0<Collection<FunctionDescriptor>> lazyOverriddenFunctionsTask = null;
private final FunctionDescriptor original;
private final Kind kind;
@Nullable
@@ -192,7 +191,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
}
private void performOverriddenLazyCalculationIfNeeded() {
Function0<Set<FunctionDescriptor>> overriddenTask = lazyOverriddenFunctionsTask;
Function0<Collection<FunctionDescriptor>> overriddenTask = lazyOverriddenFunctionsTask;
if (overriddenTask != null) {
overriddenFunctions = overriddenTask.invoke();
// Here it's important that this assignment is strictly after previous one
@@ -692,10 +691,10 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
}
}
else {
substitutedDescriptor.lazyOverriddenFunctionsTask = new Function0<Set<FunctionDescriptor>>() {
substitutedDescriptor.lazyOverriddenFunctionsTask = new Function0<Collection<FunctionDescriptor>>() {
@Override
public Set<FunctionDescriptor> invoke() {
SmartSet<FunctionDescriptor> result = SmartSet.create();
public Collection<FunctionDescriptor> invoke() {
Collection<FunctionDescriptor> result = new SmartList<FunctionDescriptor>();
for (FunctionDescriptor overriddenFunction : getOverriddenDescriptors()) {
result.add(overriddenFunction.substitute(substitutor));
}