read upper bound from jet signature, merge dup code

2011-12-19 21:36:46 +04:00
parent f0dfa436ad
commit bf751bfa98
7 changed files with 132 additions and 80 deletions
@@ -550,6 +550,9 @@ public class JetTypeMapper {
            signatureVisitor.writeClassBound();

            for (JetType jetType : typeParameterDescriptor.getUpperBounds()) {
+                if (jetType.equals(JetStandardClasses.getNullableAnyType())) {
+                    continue;
+                }
                if (jetType.getConstructor().getDeclarationDescriptor() instanceof ClassDescriptor) {
                    if (!CodegenUtil.isInterface(jetType)) {
                        mapType(jetType, signatureVisitor);