Remove OI/NI attributes from test data

compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.kt

@@ -16,7 +16,7 @@ interface C: A
 
 fun test(a: A, b: B, c: C) {
     if (a is B && a is C) {
-        val d: C = id(<!DEBUG_INFO_SMARTCAST{OI}!>a<!>)
+        val d: C = id(a)
         val e: Any = id(a)
         val f = id(a)
         checkSubtype<A>(f)
@@ -30,7 +30,7 @@ fun test(a: A, b: B, c: C) {
         val k = three(a, b, c)
         checkSubtype<A>(k)
         checkSubtype<B>(<!TYPE_MISMATCH!>k<!>)
-        val l: Int = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>three(a, b, c)<!>
+        val l: Int = <!TYPE_MISMATCH, TYPE_MISMATCH, TYPE_MISMATCH, TYPE_MISMATCH!>three(a, b, c)<!>
 
         use(d, e, f, g, h, k, l)
     }
@@ -40,11 +40,11 @@ fun <T> foo(t: T, l: MutableList<T>): T = t
 
 fun testErrorMessages(a: A, ml: MutableList<String>) {
     if (a is B && a is C) {
-        <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>foo<!>(a, <!TYPE_MISMATCH{NI}!>ml<!>)
+        foo(a, <!TYPE_MISMATCH!>ml<!>)
     }
 
     if(a is C) {
-        <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>foo<!>(a, <!TYPE_MISMATCH{NI}!>ml<!>)
+        foo(a, <!TYPE_MISMATCH!>ml<!>)
     }
 }
 

compiler/testData/diagnostics/tests/smartCasts/inference/kt29767.kt

@@ -2,7 +2,7 @@
 
 fun test(a: MutableList<out Int?>?) {
     if (a != null) {
-        val b = <!DEBUG_INFO_SMARTCAST{OI}!>a<!>[0] // no SMARTCAST diagnostic
+        val b = a[0] // no SMARTCAST diagnostic
         if (b != null) {
             <!DEBUG_INFO_SMARTCAST!>b<!>.inc()
         }