Type bounds check for class headers moved to DeclarationsChecker

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

@@ -21,6 +21,7 @@ import com.google.common.collect.Sets;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.diagnostics.Errors;
 import org.jetbrains.jet.lang.psi.*;
@@ -66,6 +67,7 @@ public class DeclarationsChecker {
             }
 
             checkSupertypesForConsistency(classDescriptor);
+            checkTypesInClassHeader(classOrObject);
 
             modifiersChecker.checkModifiersForDeclaration(classOrObject, classDescriptor);
         }
@@ -124,6 +126,32 @@ public class DeclarationsChecker {
         }
     }
 
+    private void checkTypesInClassHeader(@NotNull JetClassOrObject classOrObject) {
+        for (JetDelegationSpecifier delegationSpecifier : classOrObject.getDelegationSpecifiers()) {
+            checkBoundsForTypeInClassHeader(delegationSpecifier.getTypeReference());
+        }
+
+        if (!(classOrObject instanceof JetClass)) return;
+        JetClass jetClass = (JetClass) classOrObject;
+
+        for (JetTypeParameter jetTypeParameter : jetClass.getTypeParameters()) {
+            checkBoundsForTypeInClassHeader(jetTypeParameter.getExtendsBound());
+        }
+
+        for (JetTypeConstraint constraint : jetClass.getTypeConstraints()) {
+            checkBoundsForTypeInClassHeader(constraint.getBoundTypeReference());
+        }
+    }
+
+    private void checkBoundsForTypeInClassHeader(@Nullable JetTypeReference typeReference) {
+        if (typeReference != null) {
+            JetType type = trace.getBindingContext().get(TYPE, typeReference);
+            if (type != null) {
+                DescriptorResolver.checkBounds(typeReference, type, trace);
+            }
+        }
+    }
+
     private void checkSupertypesForConsistency(@NotNull ClassDescriptor classDescriptor) {
         Multimap<TypeConstructor, TypeProjection> multimap = SubstitutionUtils
                 .buildDeepSubstitutionMultimap(classDescriptor.getDefaultType());

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

@@ -136,10 +136,6 @@ public class TypeHierarchyResolver {
 
         // Detect and disconnect all loops in the hierarchy
         detectAndDisconnectLoops(c);
-
-        // At this point, there are no loops in the type hierarchy
-
-        checkTypesInClassHeaders(c); // Check bounds in the types used in generic bounds and supertype lists
     }
 
     @NotNull
@@ -319,34 +315,6 @@ public class TypeHierarchyResolver {
         }
     }
 
-    private void checkTypesInClassHeaders(@NotNull TopDownAnalysisContext c) {
-        for (JetClassOrObject classOrObject : c.getClasses().keySet()) {
-            for (JetDelegationSpecifier delegationSpecifier : classOrObject.getDelegationSpecifiers()) {
-                checkBoundsForTypeInClassHeader(delegationSpecifier.getTypeReference());
-            }
-
-            if (!(classOrObject instanceof JetClass)) continue;
-            JetClass jetClass = (JetClass) classOrObject;
-
-            for (JetTypeParameter jetTypeParameter : jetClass.getTypeParameters()) {
-                checkBoundsForTypeInClassHeader(jetTypeParameter.getExtendsBound());
-            }
-
-            for (JetTypeConstraint constraint : jetClass.getTypeConstraints()) {
-                checkBoundsForTypeInClassHeader(constraint.getBoundTypeReference());
-            }
-        }
-    }
-
-    private void checkBoundsForTypeInClassHeader(@Nullable JetTypeReference typeReference) {
-        if (typeReference != null) {
-            JetType type = trace.getBindingContext().get(TYPE, typeReference);
-            if (type != null) {
-                DescriptorResolver.checkBounds(typeReference, type, trace);
-            }
-        }
-    }
-
     private class ClassifierCollector extends JetVisitorVoid {
         private final TopDownAnalysisContext c;
         private final JetScope outerScope;

compiler/testData/diagnostics/tests/FinalClassObjectBound.kt

@@ -0,0 +1,4 @@
+class Other
+trait Trait
+trait WithBounds<T: Trait>
+class Test1<T> where <!UNSUPPORTED!>class object T: WithBounds<<!UPPER_BOUND_VIOLATED!>Other<!>><!>

compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java

@@ -219,6 +219,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             doTest("compiler/testData/diagnostics/tests/Dollar.kt");
         }
         
+        @TestMetadata("FinalClassObjectBound.kt")
+        public void testFinalClassObjectBound() throws Exception {
+            doTest("compiler/testData/diagnostics/tests/FinalClassObjectBound.kt");
+        }
+        
         @TestMetadata("ForRangeConventions.kt")
         public void testForRangeConventions() throws Exception {
             doTest("compiler/testData/diagnostics/tests/ForRangeConventions.kt");