ClassDescriptor is now a super-interface for ClassConstructorDescriptor and TypeAliasConstructorDescriptor.

compiler/testData/diagnostics/tests/redeclarations/TypeAliasVsClass.kt

@@ -6,11 +6,11 @@ typealias <!REDECLARATION!>SomeClass<!> = Any
 typealias <!REDECLARATION!>SomeClass<!> = Any
 
 class Outer {
-    class <!REDECLARATION, CONFLICTING_OVERLOADS!>Nested<!>
+    class <!REDECLARATION!>Nested<!>
 
-    <!CONFLICTING_OVERLOADS!>typealias <!REDECLARATION!>Nested<!> = Any<!>
-    <!CONFLICTING_OVERLOADS!>typealias <!REDECLARATION!>Nested<!> = Any<!>
-    <!CONFLICTING_OVERLOADS!>typealias <!REDECLARATION!>Nested<!> = Any<!>
+    typealias <!REDECLARATION!>Nested<!> = Any
+    typealias <!REDECLARATION!>Nested<!> = Any
+    typealias <!REDECLARATION!>Nested<!> = Any
 }
 
 // FILE: file2.kt

compiler/testData/diagnostics/tests/typealias/throwJLException.kt

@@ -3,5 +3,5 @@
 typealias Exn = java.lang.Exception
 
 fun test() {
-    throw <!FUNCTION_CALL_EXPECTED!>Exn<!>
+    throw <!NO_COMPANION_OBJECT!>Exn<!>
 }