From 895afc736d0bacff3e8c93b5fa379c3706e9c4db Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Wed, 6 Sep 2023 11:48:40 +0200
Subject: [PATCH] [JVM] Drop `I : Interpreter<V>` type parameter from
 `FastAnalyzer`

---
 .../kotlin/codegen/optimization/common/FastAnalyzer.kt        | 4 ++--
 .../kotlin/codegen/optimization/common/FastMethodAnalyzer.kt  | 2 +-
 .../kotlin/codegen/optimization/fixStack/FastStackAnalyzer.kt | 2 +-
 .../optimization/temporaryVals/FastStoreLoadAnalyzer.kt       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/FastAnalyzer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/FastAnalyzer.kt
index a610593ccc8..7225144a54e 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/FastAnalyzer.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/FastAnalyzer.kt
@@ -15,10 +15,10 @@ import org.jetbrains.org.objectweb.asm.tree.analysis.Frame
 import org.jetbrains.org.objectweb.asm.tree.analysis.Interpreter
 import org.jetbrains.org.objectweb.asm.tree.analysis.Value
 
-abstract class FastAnalyzer<V : Value, I : Interpreter<V>, F : Frame<V>>(
+abstract class FastAnalyzer<V : Value, F : Frame<V>>(
     private val owner: String,
     private val method: MethodNode,
-    private val interpreter: I,
+    private val interpreter: Interpreter<V>,
     private val pruneExceptionEdges: Boolean,
 ) {
     private val nInsns = method.instructions.size()
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/FastMethodAnalyzer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/FastMethodAnalyzer.kt
index 67dda9e5bfe..54a441ddfb5 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/FastMethodAnalyzer.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/FastMethodAnalyzer.kt
@@ -48,6 +48,6 @@ class FastMethodAnalyzer<V : Value>
     interpreter: Interpreter<V>,
     pruneExceptionEdges: Boolean = false,
     private val createFrame: (Int, Int) -> Frame<V> = { nLocals, nStack -> Frame<V>(nLocals, nStack) }
-) : FastAnalyzer<V, Interpreter<V>, Frame<V>>(owner, method, interpreter, pruneExceptionEdges) {
+) : FastAnalyzer<V, Frame<V>>(owner, method, interpreter, pruneExceptionEdges) {
     override fun newFrame(nLocals: Int, nStack: Int): Frame<V> = createFrame(nLocals, nStack)
 }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FastStackAnalyzer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FastStackAnalyzer.kt
index c55da6a9ad5..df142317712 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FastStackAnalyzer.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FastStackAnalyzer.kt
@@ -48,7 +48,7 @@ internal open class FastStackAnalyzer<V : Value, F : Frame<V>>(
     owner: String,
     method: MethodNode,
     interpreter: Interpreter<V>
-) : FastAnalyzer<V, Interpreter<V>, F>(owner, method, interpreter, pruneExceptionEdges = false) {
+) : FastAnalyzer<V, F>(owner, method, interpreter, pruneExceptionEdges = false) {
     @Suppress("UNCHECKED_CAST")
     override fun newFrame(nLocals: Int, nStack: Int): F = Frame<V>(nLocals, nStack) as F
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/temporaryVals/FastStoreLoadAnalyzer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/temporaryVals/FastStoreLoadAnalyzer.kt
index 05943f3f0f7..509df2f1cae 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/temporaryVals/FastStoreLoadAnalyzer.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/temporaryVals/FastStoreLoadAnalyzer.kt
@@ -66,6 +66,6 @@ class FastStoreLoadAnalyzer<V : Value>(
     owner: String,
     method: MethodNode,
     interpreter: Interpreter<V>
-) : FastAnalyzer<V, Interpreter<V>, StoreLoadFrame<V>>(owner, method, interpreter, pruneExceptionEdges = false) {
+) : FastAnalyzer<V, StoreLoadFrame<V>>(owner, method, interpreter, pruneExceptionEdges = false) {
     override fun newFrame(nLocals: Int, nStack: Int): StoreLoadFrame<V> = StoreLoadFrame(nLocals)
 }
\ No newline at end of file