Added check for extra and missing upper bounds in alternative signatures.

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureData.java

@@ -296,14 +296,18 @@ class AlternativeSignatureData {
                 else {
                     JetTypeConstraint constraint =
                             findTypeParameterConstraint(altFunDeclaration, pd.getName(), upperBoundIndex);
-                    assert constraint != null; // TODO fail more properly
+                    if (constraint == null) {
-                    JetTypeReference boundTypeReference = constraint.getBoundTypeReference();
+                        fail("Upper bound #%d for type parameter %s is missing", upperBoundIndex, pd.getName());
-                    assert  boundTypeReference != null;
+                    }
-                    altTypeElement = boundTypeReference.getTypeElement();
+                    //noinspection ConstantConditions
+                    altTypeElement = constraint.getBoundTypeReference().getTypeElement();
                 }
                 altParamDescriptor.addUpperBound(computeType(altTypeElement, upperBound));
                 upperBoundIndex++;
             }
+            if (findTypeParameterConstraint(altFunDeclaration, pd.getName(), upperBoundIndex) != null) {
+                fail("Extra upper bound #%d for type parameter %s", upperBoundIndex, pd.getName());
+            }
 
             altParamDescriptor.setInitialized();
             altTypeParameters.add(altParamDescriptor);

compiler/testData/readJavaBinaryClass/kotlinSignature/error/ExtraUpperBound.java

@@ -0,0 +1,10 @@
+package test;
+
+import jet.runtime.typeinfo.KotlinSignature;
+
+public class ExtraUpperBound {
+    @KotlinSignature("fun <A : Runnable> foo() : String where A : Cloneable")
+    public <A extends Runnable> String foo() {
+        throw new UnsupportedOperationException();
+    }
+}

compiler/testData/readJavaBinaryClass/kotlinSignature/error/ExtraUpperBound.kt

@@ -0,0 +1,9 @@
+package test
+
+import java.util.*
+
+public open class ExtraUpperBound : Object() {
+    public open fun <A : Runnable?> foo() : String? {
+        throw UnsupportedOperationException()
+    }
+}

compiler/testData/readJavaBinaryClass/kotlinSignature/error/ExtraUpperBound.txt

@@ -0,0 +1,6 @@
+namespace test
+
+public open class test.ExtraUpperBound : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.ExtraUpperBound
+    public open fun </*0*/ A : java.lang.Runnable?>foo(): jet.String?
+}

compiler/testData/readJavaBinaryClass/kotlinSignature/error/MissingUpperBound.java

@@ -0,0 +1,10 @@
+package test;
+
+import jet.runtime.typeinfo.KotlinSignature;
+
+public class MissingUpperBound {
+    @KotlinSignature("fun <A : Runnable> foo() : String")
+    public <A extends Runnable & Cloneable> String foo() {
+        throw new UnsupportedOperationException();
+    }
+}

compiler/testData/readJavaBinaryClass/kotlinSignature/error/MissingUpperBound.kt

@@ -0,0 +1,9 @@
+package test
+
+import java.util.*
+
+public open class MissingUpperBound : Object() {
+    public open fun <A : Runnable?> foo() : String? where A : Cloneable? {
+        throw UnsupportedOperationException()
+    }
+}

compiler/testData/readJavaBinaryClass/kotlinSignature/error/MissingUpperBound.txt

@@ -0,0 +1,6 @@
+namespace test
+
+public open class test.MissingUpperBound : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.MissingUpperBound
+    public open fun </*0*/ A : java.lang.Cloneable? & java.lang.Runnable?>foo(): jet.String?
+}