diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt index 0eedd8cf5d3..5317b98cdef 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.codegen.optimization.DeadCodeEliminationMethodTransf import org.jetbrains.kotlin.codegen.optimization.boxing.isPrimitiveUnboxing import org.jetbrains.kotlin.codegen.optimization.common.* import org.jetbrains.kotlin.codegen.optimization.fixStack.FixStackMethodTransformer -import org.jetbrains.kotlin.codegen.optimization.fixStack.top import org.jetbrains.kotlin.codegen.optimization.transformer.MethodTransformer import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.config.isReleaseCoroutines @@ -948,7 +947,7 @@ private fun allSuspensionPointsAreTailCalls( } } -internal class IgnoringCopyOperationSourceInterpreter : SourceInterpreter(OPTIMIZATION_ASM_API_VERSION) { +internal class IgnoringCopyOperationSourceInterpreter : SourceInterpreter(Opcodes.API_VERSION) { override fun copyOperation(insn: AbstractInsnNode?, value: SourceValue?) = value } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/refinedIntTypesAnalysis.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/refinedIntTypesAnalysis.kt index 2f4b59fde5d..6d2be6f7290 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/refinedIntTypesAnalysis.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/refinedIntTypesAnalysis.kt @@ -169,7 +169,7 @@ private fun checkUpdatedExpectedType(was: Type?, new: Type) { } } -private class MySourceInterpreter : SourceInterpreter(OPTIMIZATION_ASM_API_VERSION) { +private class MySourceInterpreter : SourceInterpreter(Opcodes.API_VERSION) { override fun copyOperation(insn: AbstractInsnNode, value: SourceValue) = when { insn.isStoreOperation() || insn.isLoadOperation() -> SourceValue(value.size, insn) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/PopBackwardPropagationTransformer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/PopBackwardPropagationTransformer.kt index 1e91f3ce9cc..9ccd437aae2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/PopBackwardPropagationTransformer.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/PopBackwardPropagationTransformer.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.codegen.optimization.boxing import org.jetbrains.kotlin.codegen.optimization.OptimizationMethodVisitor -import org.jetbrains.kotlin.codegen.optimization.common.OPTIMIZATION_ASM_API_VERSION import org.jetbrains.kotlin.codegen.optimization.common.debugText import org.jetbrains.kotlin.codegen.optimization.common.isLoadOperation import org.jetbrains.kotlin.codegen.optimization.common.isMeaningful @@ -120,7 +119,7 @@ class PopBackwardPropagationTransformer : MethodTransformer() { throw AssertionError("Incorrect bytecode at ${methodNode.instructions.indexOf(insn)}: ${insn.debugText} $frame") } - private inner class HazardsTrackingInterpreter : SourceInterpreter(OPTIMIZATION_ASM_API_VERSION) { + private inner class HazardsTrackingInterpreter : SourceInterpreter(Opcodes.API_VERSION) { override fun naryOperation(insn: AbstractInsnNode, values: MutableList): SourceValue { for (value in values) { value.insns.markAsDontTouch() diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/Util.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/Util.kt index 874c43b5ef3..f0434c4231b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/Util.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/Util.kt @@ -27,8 +27,6 @@ import org.jetbrains.org.objectweb.asm.Opcodes.* import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.tree.* -const val OPTIMIZATION_ASM_API_VERSION = Opcodes.API_VERSION - val AbstractInsnNode.isMeaningful: Boolean get() = when (this.type) {