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

Remove unneeded asserts from JavaSupertypeResolver

Browse Source 
Don't do anything special if a Java class happens to extend jet.JetObject: it's
not a Kotlin class and we should collect all its supertypes correctly
This commit is contained in:
Alexander Udalov
2013-09-27 14:24:05 +04:00
committed by Alexander Udalov
parent b2bcbdfb7a
commit 07f1e61146
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java
-12
View File
@@ -19,9 +19,7 @@ package org.jetbrains.jet.lang.resolve.java.resolver;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
import org.jetbrains.jet.lang.resolve.java.JvmAbi;
import org.jetbrains.jet.lang.resolve.java.structure.JavaClass;
import org.jetbrains.jet.lang.resolve.java.structure.JavaClassifier;
import org.jetbrains.jet.lang.resolve.java.structure.JavaClassifierType;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.types.JetType;
@@ -90,16 +88,6 @@ public final class JavaSupertypeResolver {
) {
List<JetType> result = new ArrayList<JetType>(supertypes.size());
for (JavaClassifierType type : supertypes) {
JavaClassifier resolved = type.getClassifier();
if (resolved != null) {
assert resolved instanceof JavaClass : "Supertype should be a class: " + resolved;
FqName fqName = ((JavaClass) resolved).getFqName();
assert fqName != null : "Unresolved supertype: " + resolved;
if (JvmAbi.JET_OBJECT.getFqName().equals(fqName)) {
continue;
}
}
JetType transformed = typeTransformer.transformToType(type, TypeUsage.SUPERTYPE, typeVariableResolver);
if (transformed.isError()) {
// TODO: report INCOMPLETE_HIERARCHY