do not include error types in hierarchy

This commit is contained in:
Stepan Koltsov
2012-05-30 21:47:19 +04:00
parent 5504015025
commit 22be8ad49a
2 changed files with 3 additions and 8 deletions
@@ -898,6 +898,9 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
}
JetType transform = semanticServices.getTypeTransformer().transformToType(type, JavaTypeTransformer.TypeUsage.SUPERTYPE, typeVariableResolver);
if (ErrorUtils.isErrorType(transform)) {
continue;
}
result.add(TypeUtils.makeNotNullable(transform));
}
@@ -367,10 +367,6 @@ public class OverrideResolver {
private void checkOverrideForMember(@NotNull CallableMemberDescriptor declared,
@NotNull Multimap<CallableDescriptor, CallableDescriptor> invisibleOverriddenDescriptors) {
if (ErrorUtils.isError(declared)) {
return;
}
JetNamedDeclaration member = (JetNamedDeclaration) BindingContextUtils.descriptorToDeclaration(trace.getBindingContext(), declared);
if (member == null) {
Boolean delegated = trace.get(DELEGATED, declared);
@@ -441,10 +437,6 @@ public class OverrideResolver {
}
private void checkOverridesForParameters(CallableMemberDescriptor declared) {
if (ErrorUtils.isError(declared)) {
return;
}
boolean fakeOverride = declared.getKind() == CallableMemberDescriptor.Kind.FAKE_OVERRIDE;
if (!fakeOverride) {
// No check if the function is not marked as 'override'