Merge remote branch 'origin/master'

2011-12-27 21:29:48 +04:00
parent 6aafaa1851 4579c9826f
commit 939f9ac279
51 changed files with 283 additions and 162 deletions
@@ -619,6 +619,11 @@ public class JetTypeMapper {
                    signatureVisitor.writeInterfaceBoundEnd();
                }
            }
+            if (jetType.getConstructor().getDeclarationDescriptor() instanceof TypeParameterDescriptor) {
+                signatureVisitor.writeInterfaceBound();
+                mapType(jetType, signatureVisitor);
+                signatureVisitor.writeInterfaceBoundEnd();
+            }
        }
        
        signatureVisitor.writeFormalTypeParameterEnd();