Remove FIELD target from jvmStatic and platformStatic annotations

compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.txt

@@ -7,7 +7,7 @@ internal final class A {
 
     public companion object Companion {
         private constructor Companion()
-        @field:kotlin.platform.platformStatic() internal final val b: kotlin.String
+        kotlin.platform.platformStatic() internal final val b: kotlin.String
         internal final var test.A.c: kotlin.String
     }
 }

compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObjectProperty.txt

@@ -4,7 +4,7 @@ internal fun main(/*0*/ kotlin.Array<kotlin.String>): kotlin.Unit
 
 internal object A {
     private constructor A()
-    @field:kotlin.platform.platformStatic() internal final val b: kotlin.String
+    kotlin.platform.platformStatic() internal final val b: kotlin.String
     internal final var test.A.c: kotlin.String
 }
 

compiler/testData/compileKotlinAgainstKotlin/PlatformStaticInObject.A.kt

@@ -0,0 +1,10 @@
+package aaa
+
+import kotlin.jvm.*
+
+public object TestObject {
+
+    @jvmStatic
+    public val test: String = "test"
+
+}

compiler/testData/compileKotlinAgainstKotlin/PlatformStaticInObject.B.kt

@@ -0,0 +1,6 @@
+fun main(args: Array<String>) {
+    val h = aaa.TestObject.test
+    if (h != "test") {
+        throw Exception()
+    }
+}

compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java

@@ -131,6 +131,12 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl
         doTest(fileName);
     }
 
+    @TestMetadata("PlatformStaticInObject.A.kt")
+    public void testPlatformStaticInObject() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/PlatformStaticInObject.A.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("PlatformTypes.A.kt")
     public void testPlatformTypes() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/PlatformTypes.A.kt");

core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt

@@ -87,8 +87,8 @@ interface KMutablePropertyImpl<R> : KMutableProperty<R>, KPropertyImpl<R> {
 
 private fun KPropertyImpl.Accessor<*>.computeCallerForAccessor(isGetter: Boolean): FunctionCaller<*> {
     fun isJvmStaticProperty() =
-            Annotations.Companion.findAnyAnnotation(property.descriptor.annotations, PLATFORM_STATIC) != null ||
-            Annotations.Companion.findAnyAnnotation(property.descriptor.annotations, JVM_STATIC) != null
+            property.descriptor.annotations.findAnnotation(PLATFORM_STATIC) != null ||
+            property.descriptor.annotations.findAnnotation(JVM_STATIC) != null
 
     fun isNotNullProperty() =
             !TypeUtils.isNullableType(property.descriptor.type)

libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt

@@ -31,7 +31,7 @@ public annotation(retention = AnnotationRetention.BINARY, mustBeDocumented = tru
  * See the [Kotlin language documentation](http://kotlinlang.org/docs/reference/java-interop.html#static-methods-and-fields)
  * for more information.
  */
-target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.FIELD, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER)
+target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER)
 public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = true) class jvmStatic
 
 /**

libraries/stdlib/src/kotlin/platform/annotations.kt

@@ -22,6 +22,6 @@ target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER)
 deprecated("Use kotlin.jvm.jvmName instead", ReplaceWith("kotlin.jvm.jvmName"))
 public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = true) class platformName(public val name: String)
 
-target(FUNCTION, FIELD, PROPERTY, PROPERTY_GETTER, PROPERTY_SETTER)
+target(FUNCTION, PROPERTY, PROPERTY_GETTER, PROPERTY_SETTER)
 deprecated("Use kotlin.jvm.jvmStatic instead", ReplaceWith("kotlin.jvm.jvmStatic"))
 public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = true) class platformStatic