rename platformName annotation to jvmName

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.kt

@@ -1,14 +1,12 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-import kotlin.platform.*
-
-<!ILLEGAL_PLATFORM_NAME!>@platformName("")<!>
+<!ILLEGAL_JVM_NAME!>@jvmName("")<!>
 fun foo(a: Any) {}
 
-<!ILLEGAL_PLATFORM_NAME!>@platformName(".")<!>
+<!ILLEGAL_JVM_NAME!>@jvmName(".")<!>
 fun foo() {}
 
-<!ILLEGAL_PLATFORM_NAME!>@platformName("/")<!>
+<!ILLEGAL_JVM_NAME!>@jvmName("/")<!>
 fun fooSlash() {}
 
-<!ILLEGAL_PLATFORM_NAME!>@platformName("<")<!>
+<!ILLEGAL_JVM_NAME!>@jvmName("<")<!>
 fun fooLT() {}

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.txt

@@ -1,6 +1,6 @@
 package
 
-kotlin.platform.platformName(name = ".") internal fun foo(): kotlin.Unit
-kotlin.platform.platformName(name = "") internal fun foo(/*0*/ a: kotlin.Any): kotlin.Unit
-kotlin.platform.platformName(name = "<") internal fun fooLT(): kotlin.Unit
-kotlin.platform.platformName(name = "/") internal fun fooSlash(): kotlin.Unit
+kotlin.jvm.jvmName(name = ".") internal fun foo(): kotlin.Unit
+kotlin.jvm.jvmName(name = "") internal fun foo(/*0*/ a: kotlin.Any): kotlin.Unit
+kotlin.jvm.jvmName(name = "<") internal fun fooLT(): kotlin.Unit
+kotlin.jvm.jvmName(name = "/") internal fun fooSlash(): kotlin.Unit

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmName.kt

@@ -0,0 +1,89 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
+
+@jvmName("a")
+fun foo() {}
+
+@jvmName("b")
+fun Any.foo() {}
+
+<!WRONG_ANNOTATION_TARGET!>@jvmName("c")<!>
+val px = 1
+
+<!WRONG_ANNOTATION_TARGET!>@jvmName("d")<!>
+val Any.px : Int
+    get() = 1
+
+val valx: Int
+    @jvmName("e")
+    get() = 1
+
+var varx: Int
+    @jvmName("f")
+    get() = 1
+    @jvmName("g")
+    set(v) {}
+
+var vardef: Int = 1
+    @jvmName("h")
+    get
+    @jvmName("i")
+    set
+
+<!WRONG_ANNOTATION_TARGET!>@jvmName("C")<!>
+class C <!WRONG_ANNOTATION_TARGET!>jvmName("primary")<!> constructor() {
+    <!WRONG_ANNOTATION_TARGET!>jvmName("ctr")<!> constructor(x: Int): this() {}
+
+    @jvmName("a")
+    fun foo() {}
+
+    @jvmName("b")
+    fun Any.foo() {}
+
+    <!WRONG_ANNOTATION_TARGET!>@jvmName("c")<!>
+    val px = 1
+
+    <!WRONG_ANNOTATION_TARGET!>@jvmName("d")<!>
+    val Any.px : Int
+        get() = 1
+
+    val valx: Int
+        @jvmName("e")
+        get() = 1
+
+    var varx: Int
+        @jvmName("f")
+        get() = 1
+        @jvmName("g")
+        set(v) {}
+}
+
+fun foo1() {
+    <!INAPPLICABLE_JVM_NAME!>@jvmName("a")<!>
+    fun foo() {}
+
+    <!WRONG_ANNOTATION_TARGET!>@jvmName("a")<!>
+    val x = 1
+}
+
+abstract class AB {
+    <!INAPPLICABLE_JVM_NAME!>@jvmName("AB_absFun1")<!>
+    abstract fun absFun1()
+
+    abstract fun absFun2()
+
+    <!INAPPLICABLE_JVM_NAME!>@jvmName("AB_openFun")<!>
+    open fun openFun() {}
+}
+
+class D: AB() {
+    override fun absFun1() {}
+
+    <!INAPPLICABLE_JVM_NAME!>@jvmName("D_absFun2")<!>
+    override fun absFun2() {}
+
+    <!INAPPLICABLE_JVM_NAME!>@jvmName("D_openFun")<!>
+    final override fun openFun() {}
+
+    @jvmName("D_finalFun")
+    fun finalFun() {}
+}

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmName.txt

@@ -0,0 +1,45 @@
+package 
+
+kotlin.jvm.jvmName(name = "c") internal val px: kotlin.Int = 1
+internal val valx: kotlin.Int
+internal var vardef: kotlin.Int
+internal var varx: kotlin.Int
+kotlin.jvm.jvmName(name = "d") internal val kotlin.Any.px: kotlin.Int
+kotlin.jvm.jvmName(name = "a") internal fun foo(): kotlin.Unit
+internal fun foo1(): kotlin.Unit
+kotlin.jvm.jvmName(name = "b") internal fun kotlin.Any.foo(): kotlin.Unit
+
+internal abstract class AB {
+    public constructor AB()
+    kotlin.jvm.jvmName(name = "AB_absFun1") internal abstract fun absFun1(): kotlin.Unit
+    internal abstract fun absFun2(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    kotlin.jvm.jvmName(name = "AB_openFun") internal open fun openFun(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+kotlin.jvm.jvmName(name = "C") internal final class C {
+    kotlin.jvm.jvmName(name = "primary") public constructor C()
+    kotlin.jvm.jvmName(name = "ctr") public constructor C(/*0*/ x: kotlin.Int)
+    kotlin.jvm.jvmName(name = "c") internal final val px: kotlin.Int = 1
+    internal final val valx: kotlin.Int
+    internal final var varx: kotlin.Int
+    kotlin.jvm.jvmName(name = "d") internal final val kotlin.Any.px: kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    kotlin.jvm.jvmName(name = "a") internal final fun foo(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    kotlin.jvm.jvmName(name = "b") internal final fun kotlin.Any.foo(): kotlin.Unit
+}
+
+internal final class D : AB {
+    public constructor D()
+    internal open override /*1*/ fun absFun1(): kotlin.Unit
+    kotlin.jvm.jvmName(name = "D_absFun2") internal open override /*1*/ fun absFun2(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    kotlin.jvm.jvmName(name = "D_finalFun") internal final fun finalFun(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    kotlin.jvm.jvmName(name = "D_openFun") internal final override /*1*/ fun openFun(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.kt

@@ -1,91 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-
-import kotlin.platform.*
-
-@platformName("a")
-fun foo() {}
-
-@platformName("b")
-fun Any.foo() {}
-
-<!WRONG_ANNOTATION_TARGET!>@platformName("c")<!>
-val px = 1
-
-<!WRONG_ANNOTATION_TARGET!>@platformName("d")<!>
-val Any.px : Int
-    get() = 1
-
-val valx: Int
-    @platformName("e")
-    get() = 1
-
-var varx: Int
-    @platformName("f")
-    get() = 1
-    @platformName("g")
-    set(v) {}
-
-var vardef: Int = 1
-    @platformName("h")
-    get
-    @platformName("i")
-    set
-
-<!WRONG_ANNOTATION_TARGET!>@platformName("C")<!>
-class C <!WRONG_ANNOTATION_TARGET!>platformName("primary")<!> constructor() {
-    <!WRONG_ANNOTATION_TARGET!>platformName("ctr")<!> constructor(x: Int): this() {}
-
-    @platformName("a")
-    fun foo() {}
-
-    @platformName("b")
-    fun Any.foo() {}
-
-    <!WRONG_ANNOTATION_TARGET!>@platformName("c")<!>
-    val px = 1
-
-    <!WRONG_ANNOTATION_TARGET!>@platformName("d")<!>
-    val Any.px : Int
-        get() = 1
-
-    val valx: Int
-        @platformName("e")
-        get() = 1
-
-    var varx: Int
-        @platformName("f")
-        get() = 1
-        @platformName("g")
-        set(v) {}
-}
-
-fun foo1() {
-    <!INAPPLICABLE_PLATFORM_NAME!>@platformName("a")<!>
-    fun foo() {}
-
-    <!WRONG_ANNOTATION_TARGET!>@platformName("a")<!>
-    val x = 1
-}
-
-abstract class AB {
-    <!INAPPLICABLE_PLATFORM_NAME!>@platformName("AB_absFun1")<!>
-    abstract fun absFun1()
-
-    abstract fun absFun2()
-
-    <!INAPPLICABLE_PLATFORM_NAME!>@platformName("AB_openFun")<!>
-    open fun openFun() {}
-}
-
-class D: AB() {
-    override fun absFun1() {}
-
-    <!INAPPLICABLE_PLATFORM_NAME!>@platformName("D_absFun2")<!>
-    override fun absFun2() {}
-
-    <!INAPPLICABLE_PLATFORM_NAME!>@platformName("D_openFun")<!>
-    final override fun openFun() {}
-
-    @platformName("D_finalFun")
-    fun finalFun() {}
-}

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.txt

@@ -1,45 +0,0 @@
-package 
-
-kotlin.platform.platformName(name = "c") internal val px: kotlin.Int = 1
-internal val valx: kotlin.Int
-internal var vardef: kotlin.Int
-internal var varx: kotlin.Int
-kotlin.platform.platformName(name = "d") internal val kotlin.Any.px: kotlin.Int
-kotlin.platform.platformName(name = "a") internal fun foo(): kotlin.Unit
-internal fun foo1(): kotlin.Unit
-kotlin.platform.platformName(name = "b") internal fun kotlin.Any.foo(): kotlin.Unit
-
-internal abstract class AB {
-    public constructor AB()
-    kotlin.platform.platformName(name = "AB_absFun1") internal abstract fun absFun1(): kotlin.Unit
-    internal abstract fun absFun2(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    kotlin.platform.platformName(name = "AB_openFun") internal open fun openFun(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-kotlin.platform.platformName(name = "C") internal final class C {
-    kotlin.platform.platformName(name = "primary") public constructor C()
-    kotlin.platform.platformName(name = "ctr") public constructor C(/*0*/ x: kotlin.Int)
-    kotlin.platform.platformName(name = "c") internal final val px: kotlin.Int = 1
-    internal final val valx: kotlin.Int
-    internal final var varx: kotlin.Int
-    kotlin.platform.platformName(name = "d") internal final val kotlin.Any.px: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    kotlin.platform.platformName(name = "a") internal final fun foo(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    kotlin.platform.platformName(name = "b") internal final fun kotlin.Any.foo(): kotlin.Unit
-}
-
-internal final class D : AB {
-    public constructor D()
-    internal open override /*1*/ fun absFun1(): kotlin.Unit
-    kotlin.platform.platformName(name = "D_absFun2") internal open override /*1*/ fun absFun2(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    kotlin.platform.platformName(name = "D_finalFun") internal final fun finalFun(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    kotlin.platform.platformName(name = "D_openFun") internal final override /*1*/ fun openFun(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}