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

Do not look for a common supertype if there is only one type in the worklist

Browse Source
This commit is contained in:
Andrey Breslav
2013-08-22 12:13:15 +04:00
parent eeb4aac313
commit 96335b2e71
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/CommonSupertypes.java
+2 -1
View File
@@ -35,8 +35,9 @@ import static org.jetbrains.jet.lang.types.Variance.*;
public class CommonSupertypes { public class CommonSupertypes {
@NotNull @NotNull
public static JetType commonSupertype(@NotNull Collection<JetType> types) { public static JetType commonSupertype(@NotNull Collection<JetType> types) {
assert !types.isEmpty();
Collection<JetType> typeSet = new HashSet<JetType>(types); Collection<JetType> typeSet = new HashSet<JetType>(types);
assert !typeSet.isEmpty(); if (typeSet.size() == 1) return typeSet.iterator().next();
// If any of the types is nullable, the result must be nullable // If any of the types is nullable, the result must be nullable
// This also removed Nothing and Nothing? because they are subtypes of everything else // This also removed Nothing and Nothing? because they are subtypes of everything else