Fix failing tests after 395d595b

compiler/testData/multiplatform/incompatibleCallables/output.txt

@@ -5,73 +5,73 @@ Output:
 -- JVM --
 Exit code: COMPILATION_ERROR
 Output:
-compiler/testData/multiplatform/incompatibleCallables/common.kt:1:12: error: expected function 'f1' has no actual declaration in module <main>
+compiler/testData/multiplatform/incompatibleCallables/common.kt:1:12: error: expected function 'f1' has no actual declaration in module <main> for JVM
 The following declaration is incompatible because return type is different:
     public actual fun f1(): String
 
 expect fun f1()
            ^
-compiler/testData/multiplatform/incompatibleCallables/common.kt:5:14: error: expected function 'f3' has no actual declaration in module <main>
+compiler/testData/multiplatform/incompatibleCallables/common.kt:5:14: error: expected function 'f3' has no actual declaration in module <main> for JVM
 The following declaration is incompatible because parameter types are different:
     public actual fun f3(name: Double): Unit
 
 expect fun f3(name: String)
              ^
-compiler/testData/multiplatform/incompatibleCallables/common.kt:6:24: error: expected function 'f3ext' has no actual declaration in module <main>
+compiler/testData/multiplatform/incompatibleCallables/common.kt:6:24: error: expected function 'f3ext' has no actual declaration in module <main> for JVM
 The following declaration is incompatible because parameter types are different:
     public actual fun Double.f3ext(): Unit
 
 expect fun String.f3ext()
                        ^
-compiler/testData/multiplatform/incompatibleCallables/common.kt:8:14: error: expected function 'f4' has no actual declaration in module <main>
+compiler/testData/multiplatform/incompatibleCallables/common.kt:8:14: error: expected function 'f4' has no actual declaration in module <main> for JVM
 The following declaration is incompatible because parameter shapes are different (extension vs non-extension):
     public actual fun String.f4(): Unit
 
 expect fun f4(name: String)
              ^
-compiler/testData/multiplatform/incompatibleCallables/common.kt:10:12: error: expected function 'f5' has no actual declaration in module <main>
+compiler/testData/multiplatform/incompatibleCallables/common.kt:10:12: error: expected function 'f5' has no actual declaration in module <main> for JVM
 The following declaration is incompatible because parameter shapes are different (extension vs non-extension):
     public actual fun f5(name: String): Unit
 
 expect fun String.f5()
            ^
-compiler/testData/multiplatform/incompatibleCallables/common.kt:12:14: error: expected function 'f6' has no actual declaration in module <main>
+compiler/testData/multiplatform/incompatibleCallables/common.kt:12:14: error: expected function 'f6' has no actual declaration in module <main> for JVM
 The following declaration is incompatible because number of value parameters is different:
     public actual fun f6(p2: Int): Unit
 
 expect fun f6(p1: String, p2: Int)
              ^
-compiler/testData/multiplatform/incompatibleCallables/common.kt:14:12: error: expected function 'f7' has no actual declaration in module <main>
+compiler/testData/multiplatform/incompatibleCallables/common.kt:14:12: error: expected function 'f7' has no actual declaration in module <main> for JVM
 The following declaration is incompatible because number of type parameters is different:
     public actual fun <K, V> f7(): Unit
 
 expect fun <T> f7()
            ^
-compiler/testData/multiplatform/incompatibleCallables/common.kt:19:12: error: expected function 'f11' has no actual declaration in module <main>
+compiler/testData/multiplatform/incompatibleCallables/common.kt:19:12: error: expected function 'f11' has no actual declaration in module <main> for JVM
 The following declaration is incompatible because upper bounds of type parameters are different:
     public actual fun <T : Annotation> f11(): Unit
 
 expect fun <T : Number> f11()
            ^
-compiler/testData/multiplatform/incompatibleCallables/common.kt:20:12: error: expected function 'f12' has no actual declaration in module <main>
+compiler/testData/multiplatform/incompatibleCallables/common.kt:20:12: error: expected function 'f12' has no actual declaration in module <main> for JVM
 The following declaration is incompatible because upper bounds of type parameters are different:
     public actual fun <U : MutableList<out String>> f12(): Unit
 
 expect fun <U : MutableList<String>> f12()
            ^
-compiler/testData/multiplatform/incompatibleCallables/common.kt:21:12: error: expected function 'f13' has no actual declaration in module <main>
+compiler/testData/multiplatform/incompatibleCallables/common.kt:21:12: error: expected function 'f13' has no actual declaration in module <main> for JVM
 The following declaration is incompatible because upper bounds of type parameters are different:
     public actual fun <A, B : Comparable<B>> f13(): Unit
 
 expect fun <A, B : Comparable<A>> f13()
            ^
-compiler/testData/multiplatform/incompatibleCallables/common.kt:32:15: error: expected function 'f21' has no actual declaration in module <main>
+compiler/testData/multiplatform/incompatibleCallables/common.kt:32:15: error: expected function 'f21' has no actual declaration in module <main> for JVM
 The following declaration is incompatible because parameter types are different:
     public actual fun f21(c: Unit.() -> Unit): Unit
 
 expect fun f21(c: suspend Unit.() -> Unit)
               ^
-compiler/testData/multiplatform/incompatibleCallables/common.kt:33:15: error: expected function 'f22' has no actual declaration in module <main>
+compiler/testData/multiplatform/incompatibleCallables/common.kt:33:15: error: expected function 'f22' has no actual declaration in module <main> for JVM
 The following declaration is incompatible because parameter types are different:
     public actual fun f22(c: suspend Unit.() -> Unit): Unit
 

compiler/testData/multiplatform/incompatibleClasses/output.txt

@@ -5,19 +5,19 @@ Output:
 -- JVM --
 Exit code: COMPILATION_ERROR
 Output:
-compiler/testData/multiplatform/incompatibleClasses/common.kt:14:16: error: expected class 'C1' has no actual declaration in module <main>
+compiler/testData/multiplatform/incompatibleClasses/common.kt:14:16: error: expected class 'C1' has no actual declaration in module <main> for JVM
 The following declaration is incompatible because number of type parameters is different:
     public final actual class C1<A, Extra>
 
 expect class C1<A>
                ^
-compiler/testData/multiplatform/incompatibleClasses/common.kt:16:16: error: expected class 'C3' has no actual declaration in module <main>
+compiler/testData/multiplatform/incompatibleClasses/common.kt:16:16: error: expected class 'C3' has no actual declaration in module <main> for JVM
 The following declaration is incompatible because upper bounds of type parameters are different:
     public final actual class C3<D, E : D?>
 
 expect class C3<D, E : D>
                ^
-compiler/testData/multiplatform/incompatibleClasses/common.kt:18:16: error: expected class 'C4' has no actual declaration in module <main>
+compiler/testData/multiplatform/incompatibleClasses/common.kt:18:16: error: expected class 'C4' has no actual declaration in module <main> for JVM
 The following declaration is incompatible because upper bounds of type parameters are different:
     public actual typealias C4<F> = C4Impl<F>
 

compiler/testData/multiplatform/missingOverload/output.txt

@@ -5,7 +5,7 @@ Output:
 -- JVM --
 Exit code: COMPILATION_ERROR
 Output:
-compiler/testData/multiplatform/missingOverload/common.kt:7:13: error: expected function 'g' has no actual declaration in module <main>
+compiler/testData/multiplatform/missingOverload/common.kt:7:13: error: expected function 'g' has no actual declaration in module <main> for JVM
 The following declaration is incompatible because parameter types are different:
     public actual fun g(a: Any): Unit
 

compiler/testData/multiplatform/optionalExpectationIncorrectUse/output.txt

@@ -26,7 +26,7 @@ fun useInSignature(a: A) = a.toString()
 compiler/testData/multiplatform/optionalExpectationIncorrectUse/common.kt:9:1: error: this annotation is not applicable to target 'class'
 @OptionalExpectation
 ^
-compiler/testData/multiplatform/optionalExpectationIncorrectUse/common.kt:10:14: error: expected class 'NotAnAnnotationClass' has no actual declaration in module <main>
+compiler/testData/multiplatform/optionalExpectationIncorrectUse/common.kt:10:14: error: expected class 'NotAnAnnotationClass' has no actual declaration in module <main> for JVM
 expect class NotAnAnnotationClass
              ^
 compiler/testData/multiplatform/optionalExpectationIncorrectUse/common.kt:12:1: error: '@OptionalExpectation' can only be used on an expected annotation class