[FIR] Ignore failing test, improve DiagnosticKind, fix UPPER_BOUND

compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.fir.kt

@@ -2,5 +2,5 @@
 import java.util.ArrayList
 
 @ArrayList<Int>(1, 1) fun b() {}
-@<!OTHER_ERROR!>Xoo<!>(<!UNRESOLVED_REFERENCE!>x<!>) fun c() {}
+@<!UNRESOLVED_REFERENCE!>Xoo<!>(<!UNRESOLVED_REFERENCE!>x<!>) fun c() {}
 @java.lang.Deprecated(<!UNRESOLVED_REFERENCE!>x<!>) fun a() {}

compiler/testData/diagnostics/tests/annotations/AnnotationForObject.fir.kt

@@ -1,3 +0,0 @@
-// Check that there won't be "Rewrite at slice ANNOTATION key" exception - EA-36935
-@<!OTHER_ERROR!>someErrorAnnotation<!> object Test {
-}

compiler/testData/diagnostics/tests/annotations/AnnotationForObject.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // Check that there won't be "Rewrite at slice ANNOTATION key" exception - EA-36935
 @<!UNRESOLVED_REFERENCE!>someErrorAnnotation<!> object Test {
 }

compiler/testData/diagnostics/tests/annotations/UnresolvedAnnotationOnObject.fir.kt

@@ -1,9 +0,0 @@
-package test
-
-// Checks that there is no rewrite error at ANNOTATION slice because of resolving annotations for object in lazy resolve and resolving
-// object as property (method tries to resolve annotations too).
-
-@<!OTHER_ERROR!>BadAnnotation<!>
-object SomeObject
-
-val some = SomeObject

compiler/testData/diagnostics/tests/annotations/UnresolvedAnnotationOnObject.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 package test
 
 // Checks that there is no rewrite error at ANNOTATION slice because of resolving annotations for object in lazy resolve and resolving

compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.fir.kt

@@ -34,7 +34,7 @@ annotation class Ann8(val p1: Array<String>,
                       val p4: Array<Ann1>)
 
 annotation class Ann9(
-        val error: <!OTHER_ERROR!>Unresolved<!> = <!UNRESOLVED_REFERENCE!>Unresolved<!>.<!UNRESOLVED_REFERENCE!>VALUE<!>
+        val error: <!UNRESOLVED_REFERENCE!>Unresolved<!> = <!UNRESOLVED_REFERENCE!>Unresolved<!>.<!UNRESOLVED_REFERENCE!>VALUE<!>
 )
 
 

compiler/testData/diagnostics/tests/annotations/kt1860-negative.fir.kt

@@ -1,10 +1,10 @@
 // !WITH_NEW_INFERENCE
-fun foo(@<!OTHER_ERROR!>varargs<!> f : Int) {}
+fun foo(@<!UNRESOLVED_REFERENCE!>varargs<!> f : Int) {}
 
 var bar : Int = 1
-  set(@<!OTHER_ERROR!>varargs<!> v) {}
+  set(@<!UNRESOLVED_REFERENCE!>varargs<!> v) {}
 
-val x : (Int) -> Int = {@<!OTHER_ERROR!>varargs<!> x <!SYNTAX!>: Int -> x<!>}
+val x : (Int) -> Int = {@<!UNRESOLVED_REFERENCE!>varargs<!> x <!SYNTAX!>: Int -> x<!>}
 
-class Hello(@<!OTHER_ERROR!>varargs<!> args: Any) {
+class Hello(@<!UNRESOLVED_REFERENCE!>varargs<!> args: Any) {
 }

compiler/testData/diagnostics/tests/annotations/unresolvedReferenceRange.fir.kt

@@ -1,5 +1,5 @@
-@<!OTHER_ERROR!>Ann<!> class A
-@<!OTHER_ERROR!>Ann<!> class B
-@<!OTHER_ERROR!>Ann<!>(1) class C
-@<!OTHER_ERROR!>kotlin.Ann<!>(1) class D
-@<!OTHER_ERROR!>kotlin.annotation.Ann<!>(1) class E
+@<!UNRESOLVED_REFERENCE!>Ann<!> class A
+@<!UNRESOLVED_REFERENCE!>Ann<!> class B
+@<!UNRESOLVED_REFERENCE!>Ann<!>(1) class C
+@<!UNRESOLVED_REFERENCE!>kotlin.Ann<!>(1) class D
+@<!UNRESOLVED_REFERENCE!>kotlin.annotation.Ann<!>(1) class E