Get rid of deprecated annotations and modifiers in project code

compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContextUtil.kt

@@ -21,16 +21,19 @@ import org.jetbrains.org.objectweb.asm.Type
 
 
 public object CodegenContextUtil {
-    public @JvmStatic fun getImplementationOwnerClassType(owner: CodegenContext<*>): Type? =
+    @JvmStatic
+    public fun getImplementationOwnerClassType(owner: CodegenContext<*>): Type? =
             when (owner) {
                 is DelegatingFacadeContext -> owner.delegateToClassType
                 is DelegatingToPartContext -> owner.implementationOwnerClassType
                 else -> null
             }
 
-    public @JvmStatic fun getImplementationClassShortName(owner: CodegenContext<*>): String? =
+    @JvmStatic
+    public fun getImplementationClassShortName(owner: CodegenContext<*>): String? =
             getImplementationOwnerClassType(owner)?.let { AsmUtil.shortNameByAsmType(it) }
 
-    public @JvmStatic fun isImplClassOwner(owner: CodegenContext<*>): Boolean =
+    @JvmStatic
+    public fun isImplClassOwner(owner: CodegenContext<*>): Boolean =
             owner !is DelegatingFacadeContext
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt

@@ -30,7 +30,6 @@ import org.jetbrains.org.objectweb.asm.Type
 import org.jetbrains.org.objectweb.asm.signature.SignatureReader
 import org.jetbrains.org.objectweb.asm.signature.SignatureWriter
 import org.jetbrains.org.objectweb.asm.tree.*
-import kotlin.platform.platformStatic
 
 public class ReifiedTypeInliner(private val parametersMapping: ReifiedTypeParameterMappings?) {
 
@@ -56,10 +55,12 @@ public class ReifiedTypeInliner(private val parametersMapping: ReifiedTypeParame
             return insn.owner == IntrinsicMethods.INTRINSICS_CLASS_NAME && namePredicate(insn.name)
         }
 
-        platformStatic public fun isNeedClassReificationMarker(insn: AbstractInsnNode): Boolean =
+        @JvmStatic
+        public fun isNeedClassReificationMarker(insn: AbstractInsnNode): Boolean =
                 isReifiedMarker(insn) { s -> s == NEED_CLASS_REIFICATION_MARKER_METHOD_NAME }
 
-        platformStatic public fun putNeedClassReificationMarker(v: MethodVisitor) {
+        @JvmStatic
+        public fun putNeedClassReificationMarker(v: MethodVisitor) {
             v.visitMethodInsn(
                     Opcodes.INVOKESTATIC,
                     IntrinsicMethods.INTRINSICS_CLASS_NAME, NEED_CLASS_REIFICATION_MARKER_METHOD_NAME,

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAPParser.kt

@@ -17,11 +17,10 @@
 package org.jetbrains.kotlin.codegen.inline
 
 import com.intellij.util.SmartFMap
-import kotlin.platform.platformStatic
 
 object SMAPParser {
 
-    @platformStatic
+    @JvmStatic
     /*null smap means that there is no any debug info in file (e.g. sourceName)*/
     public fun parseOrCreateDefault(mappingInfo: String?, source: String?, path: String, methodStartLine: Int, methodEndLine: Int): SMAP {
         if (mappingInfo == null || mappingInfo.isEmpty()) {
@@ -41,7 +40,7 @@ object SMAPParser {
         return parse(mappingInfo)
     }
 
-    @platformStatic
+    @JvmStatic
     public fun parse(mappingInfo: String): SMAP {
         val fileMappings = linkedMapOf<Int, FileMapping>()
 

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TryBlockClustering.kt

@@ -88,7 +88,7 @@ class TryBlockCluster<T : IntervalWithHandler>(val blocks: MutableList<T>) {
 
 
 fun <T : IntervalWithHandler> doClustering(blocks: List<T>): List<TryBlockCluster<T>> {
-    @data class TryBlockInterval(val startLabel: LabelNode, val endLabel: LabelNode)
+    data class TryBlockInterval(val startLabel: LabelNode, val endLabel: LabelNode)
 
     val clusters = linkedMapOf<TryBlockInterval, TryBlockCluster<T>>()
     blocks.forEach { block ->

compiler/backend/src/org/jetbrains/kotlin/codegen/pseudoInsns/PseudoInsns.kt

@@ -22,7 +22,6 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
 import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode
 import org.jetbrains.org.objectweb.asm.tree.InsnList
 import org.jetbrains.org.objectweb.asm.tree.MethodInsnNode
-import kotlin.platform.platformStatic
 
 public val PSEUDO_INSN_CALL_OWNER: String = "kotlin/jvm/internal/\$PseudoInsn"