diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/coroutineCodegenUtil.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/coroutineCodegenUtil.kt
index 9c9b05f04c0..a37332b8e43 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/coroutineCodegenUtil.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/coroutineCodegenUtil.kt
@@ -472,7 +472,7 @@ fun FunctionDescriptor.originalReturnTypeOfSuspendFunctionReturningUnboxedInline
     if (AsmUtil.isPrimitive(typeMapper.mapType(originalReturnType.makeNotNullable()))) return null
     // Force boxing for nullable inline class types with nullable underlying type
     if (originalReturnType.isMarkedNullable && originalReturnType.isNullableUnderlyingType()) return null
-    // Force boxing if the function overrides function with return type Any
+    // Force boxing if the function overrides function with different type modulo nullability
     if (originalDescriptor.overriddenDescriptors.any {
             (it.original.returnType?.isMarkedNullable == true && it.original.returnType?.isNullableUnderlyingType() == true) ||
                     it.original.returnType?.makeNotNullable() != originalReturnType.makeNotNullable()
diff --git a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java
index 9bd364e5426..322baa28c48 100644
--- a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java
+++ b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java
@@ -7518,11 +7518,21 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
@@ -7725,11 +7735,21 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
@@ -7932,11 +7952,21 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunSameJvmType.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunSameJvmType.kt
new file mode 100644
index 00000000000..5ee93e52c59
--- /dev/null
+++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunSameJvmType.kt
@@ -0,0 +1,48 @@
+// WITH_RUNTIME
+// WITH_COROUTINES
+// IGNORE_BACKEND_FIR: JVM_IR
+
+import helpers.*
+import kotlin.coroutines.*
+
+fun builder(c: suspend () -> Unit) {
+    c.startCoroutine(EmptyContinuation)
+}
+
+interface I
+
+@Suppress("UNSUPPORTED_FEATURE")
+inline class IC(val i: I): I
+
+class Wrapper(val s: String): I
+
+interface IBar {
+    suspend fun bar(): I
+}
+
+class Test() : IBar {
+    override suspend fun bar(): IC = IC(Wrapper("OK"))
+
+    suspend fun test1(): String {
+        val b: IBar = this
+        return ((b.bar() as IC).i as Wrapper).s
+    }
+
+    suspend fun test2(): String = ((bar() as IC).i as Wrapper).s
+}
+
+fun box(): String {
+    var result = "FAIL 1"
+    builder {
+        result = Test().test1()
+    }
+    if (result != "OK") return "FAIL 1 $result"
+
+    result = "FAIL2 "
+    builder {
+        result = Test().test2()
+    }
+    if (result != "OK") return "FAIL 2 $result"
+
+    return result
+}
diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt
new file mode 100644
index 00000000000..c500335dc17
--- /dev/null
+++ b/compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt
@@ -0,0 +1,49 @@
+// WITH_RUNTIME
+// WITH_COROUTINES
+
+import helpers.*
+import kotlin.coroutines.*
+
+fun builder(c: suspend () -> Unit) {
+    c.startCoroutine(EmptyContinuation)
+}
+
+interface I
+
+@Suppress("UNSUPPORTED_FEATURE")
+inline class IC(val i: I): I
+
+class Wrapper(val s: String): I
+
+interface IBar {
+    suspend fun bar(): I?
+}
+
+class Test() : IBar {
+    override suspend fun bar(): IC = IC(Wrapper("OK"))
+
+    suspend fun test1(): String {
+        val b: IBar = this
+        return ((b.bar() as IC).i as Wrapper).s
+    }
+
+    suspend fun test2(): String {
+        return ((bar() as IC).i as Wrapper).s
+    }
+}
+
+fun box(): String {
+    var result = "FAIL"
+    builder {
+        result = Test().test1()
+    }
+    if (result != "OK") return "FAIL 1 $result"
+
+    result = "FAIL2"
+    builder {
+        result = Test().test2()
+    }
+    if (result != "OK") return "FAIL 2 $result"
+
+    return result
+}
diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunSameJvmType.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunSameJvmType.kt
new file mode 100644
index 00000000000..2288cf86b8b
--- /dev/null
+++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunSameJvmType.kt
@@ -0,0 +1,57 @@
+// WITH_RUNTIME
+// WITH_COROUTINES
+// IGNORE_BACKEND_FIR: JVM_IR
+
+import helpers.*
+import kotlin.coroutines.*
+
+fun builder(c: suspend () -> Unit) {
+    c.startCoroutine(EmptyContinuation)
+}
+
+interface I
+
+@Suppress("UNSUPPORTED_FEATURE")
+inline class IC(val i: I): I
+
+class Wrapper(val s: String): I
+
+interface IBar {
+    suspend fun bar(): I
+}
+
+var c: Continuation<Any>? = null
+
+suspend fun <T> suspendMe(): T = suspendCoroutine {
+    @Suppress("UNCHECKED_CAST")
+    c = it as Continuation<Any>
+}
+
+class Test() : IBar {
+    override suspend fun bar(): IC = suspendMe()
+
+    suspend fun test1(): String {
+        val b: IBar = this
+        return ((b.bar() as IC).i as Wrapper).s
+    }
+
+    suspend fun test2(): String = ((bar() as IC).i as Wrapper).s
+}
+
+fun box(): String {
+    var result = "FAIL 1"
+    builder {
+        result = Test().test1()
+    }
+    c?.resume(IC(Wrapper("OK")))
+    if (result != "OK") return "FAIL 1 $result"
+
+    result = "FAIL2 "
+    builder {
+        result = Test().test2()
+    }
+    c?.resume(IC(Wrapper("OK")))
+    if (result != "OK") return "FAIL 2 $result"
+
+    return result
+}
diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt
new file mode 100644
index 00000000000..2d901489cd4
--- /dev/null
+++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt
@@ -0,0 +1,58 @@
+// WITH_RUNTIME
+// WITH_COROUTINES
+
+import helpers.*
+import kotlin.coroutines.*
+
+fun builder(c: suspend () -> Unit) {
+    c.startCoroutine(EmptyContinuation)
+}
+
+interface I
+
+@Suppress("UNSUPPORTED_FEATURE")
+inline class IC(val i: I): I
+
+class Wrapper(val s: String): I
+
+interface IBar {
+    suspend fun bar(): I?
+}
+
+var c: Continuation<Any>? = null
+
+suspend fun <T> suspendMe(): T = suspendCoroutine {
+    @Suppress("UNCHECKED_CAST")
+    c = it as Continuation<Any>
+}
+
+class Test() : IBar {
+    override suspend fun bar(): IC = suspendMe()
+
+    suspend fun test1(): String {
+        val b: IBar = this
+        return ((b.bar() as IC).i as Wrapper).s
+    }
+
+    suspend fun test2(): String {
+        return ((bar() as IC).i as Wrapper).s
+    }
+}
+
+fun box(): String {
+    var result = "FAIL"
+    builder {
+        result = Test().test1()
+    }
+    c?.resume(IC(Wrapper("OK")))
+    if (result != "OK") return "FAIL 1 $result"
+
+    result = "FAIL2"
+    builder {
+        result = Test().test2()
+    }
+    c?.resume(IC(Wrapper("OK")))
+    if (result != "OK") return "FAIL 2 $result"
+
+    return result
+}
diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunSameJvmType.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunSameJvmType.kt
new file mode 100644
index 00000000000..496c3519700
--- /dev/null
+++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunSameJvmType.kt
@@ -0,0 +1,60 @@
+// WITH_RUNTIME
+// WITH_COROUTINES
+// IGNORE_BACKEND_FIR: JVM_IR
+
+import helpers.*
+import kotlin.coroutines.*
+
+var result = "FAIL"
+
+fun builder(c: suspend () -> Unit) {
+    c.startCoroutine(handleExceptionContinuation {
+        result = it.message!!
+    })
+}
+
+interface I
+
+@Suppress("UNSUPPORTED_FEATURE")
+inline class IC(val i: I): I
+
+class Wrapper(val s: String): I
+
+interface IBar {
+    suspend fun bar(): I
+}
+
+var c: Continuation<Any>? = null
+
+suspend fun <T> suspendMe(): T = suspendCoroutine {
+    @Suppress("UNCHECKED_CAST")
+    c = it as Continuation<Any>
+}
+
+class Test() : IBar {
+    override suspend fun bar(): IC = suspendMe()
+
+    suspend fun test1(): String {
+        val b: IBar = this
+        return ((b.bar() as IC).i as Wrapper).s
+    }
+
+    suspend fun test2(): String = ((bar() as IC).i as Wrapper).s
+}
+
+fun box(): String {
+    builder {
+        Test().test1()
+    }
+    c?.resumeWithException(IllegalStateException("OK"))
+    if (result != "OK") return "FAIL 1 $result"
+
+    result = "FAIL2 "
+    builder {
+        Test().test2()
+    }
+    c?.resumeWithException(IllegalStateException("OK"))
+    if (result != "OK") return "FAIL 2 $result"
+
+    return result
+}
diff --git a/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt
new file mode 100644
index 00000000000..48f400d924b
--- /dev/null
+++ b/compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt
@@ -0,0 +1,61 @@
+// WITH_RUNTIME
+// WITH_COROUTINES
+
+import helpers.*
+import kotlin.coroutines.*
+
+var result = "FAIL"
+
+fun builder(c: suspend () -> Unit) {
+    c.startCoroutine(handleExceptionContinuation {
+        result = it.message!!
+    })
+}
+
+interface I
+
+@Suppress("UNSUPPORTED_FEATURE")
+inline class IC(val i: I): I
+
+class Wrapper(val s: String): I
+
+interface IBar {
+    suspend fun bar(): I?
+}
+
+var c: Continuation<Any>? = null
+
+suspend fun <T> suspendMe(): T = suspendCoroutine {
+    @Suppress("UNCHECKED_CAST")
+    c = it as Continuation<Any>
+}
+
+class Test() : IBar {
+    override suspend fun bar(): IC = suspendMe()
+
+    suspend fun test1(): String {
+        val b: IBar = this
+        return ((b.bar() as IC).i as Wrapper).s
+    }
+
+    suspend fun test2(): String {
+        return ((bar() as IC).i as Wrapper).s
+    }
+}
+
+fun box(): String {
+    builder {
+        Test().test1()
+    }
+    c?.resumeWithException(IllegalStateException("OK"))
+    if (result != "OK") return "FAIL 1 $result"
+
+    result = "FAIL2"
+    builder {
+        Test().test2()
+    }
+    c?.resumeWithException(IllegalStateException("OK"))
+    if (result != "OK") return "FAIL 2 $result"
+
+    return result
+}
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/inlineClasses/noInlineClassBoxingInSuspendFunReturn_SameJvmType.kt b/compiler/testData/codegen/bytecodeText/coroutines/inlineClasses/noInlineClassBoxingInSuspendFunReturn_SameJvmType.kt
new file mode 100644
index 00000000000..3e9f5f1e2ab
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeText/coroutines/inlineClasses/noInlineClassBoxingInSuspendFunReturn_SameJvmType.kt
@@ -0,0 +1,31 @@
+// IGNORE_BACKEND: JVM_IR
+
+interface I
+
+inline class ICI(val i: I): I
+
+class Wrapper(val s: String): I
+
+suspend fun suspendICI(): ICI = ICI(Wrapper(""))
+suspend fun suspendI(): I = ICI(Wrapper(""))
+suspend fun <T> suspendGeneric(x: T): T = x
+
+fun useICString(x: ICI) {}
+fun useI(x: I) {}
+
+suspend fun test() {
+    useICString(suspendICI())
+    useICString(suspendGeneric(ICI(Wrapper(""))))
+    useI(suspendI())
+    useI(suspendICI())
+}
+
+// -- 1 in 'suspendAny(): I = ICI("")'
+// -- 1 in 'useI(suspendICI())'
+// -- 1 in 'suspendGeneric(ICI(""))'
+// 3 INVOKESTATIC ICI\.box-impl
+
+// -- 1 in 'useICI(suspendGeneric(ICI("")))
+// -- 1 in 'equals-impl' for ICI
+// -- 2 in resume path of suspendICI
+// 4 INVOKEVIRTUAL ICI\.unbox-impl
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
index 4ff4825d335..b5d87cf82da 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
@@ -8283,11 +8283,21 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
@@ -8575,11 +8585,21 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
@@ -8867,11 +8887,21 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
index 82fe6c2a2f4..fffa0fd1e94 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
@@ -1582,6 +1582,11 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
                 runTest("compiler/testData/codegen/bytecodeText/coroutines/inlineClasses/noInlineClassBoxingInSuspendFunReturn_InlineAny.kt");
             }
 
+            @TestMetadata("noInlineClassBoxingInSuspendFunReturn_SameJvmType.kt")
+            public void testNoInlineClassBoxingInSuspendFunReturn_SameJvmType() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/coroutines/inlineClasses/noInlineClassBoxingInSuspendFunReturn_SameJvmType.kt");
+            }
+
             @TestMetadata("noInlineClassBoxingInSuspendFunReturn_String.kt")
             public void testNoInlineClassBoxingInSuspendFunReturn_String() throws Exception {
                 runTest("compiler/testData/codegen/bytecodeText/coroutines/inlineClasses/noInlineClassBoxingInSuspendFunReturn_String.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
index 7547d51c0c0..a59a89b7df3 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
@@ -8283,11 +8283,21 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
@@ -8575,11 +8585,21 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
@@ -8867,11 +8887,21 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
index 70eb63bb641..3acefb95544 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
@@ -7518,11 +7518,21 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
@@ -7725,11 +7735,21 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
@@ -7932,11 +7952,21 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java
index bc5b4de34f2..f70acde9c75 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java
@@ -1587,6 +1587,11 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest {
                 runTest("compiler/testData/codegen/bytecodeText/coroutines/inlineClasses/noInlineClassBoxingInSuspendFunReturn_InlineAny.kt");
             }
 
+            @TestMetadata("noInlineClassBoxingInSuspendFunReturn_SameJvmType.kt")
+            public void testNoInlineClassBoxingInSuspendFunReturn_SameJvmType() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/coroutines/inlineClasses/noInlineClassBoxingInSuspendFunReturn_SameJvmType.kt");
+            }
+
             @TestMetadata("noInlineClassBoxingInSuspendFunReturn_String.kt")
             public void testNoInlineClassBoxingInSuspendFunReturn_String() throws Exception {
                 runTest("compiler/testData/codegen/bytecodeText/coroutines/inlineClasses/noInlineClassBoxingInSuspendFunReturn_String.kt");
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
index 95be9e840cc..74b1dd2feeb 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
@@ -6338,11 +6338,21 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
@@ -6545,11 +6555,21 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
@@ -6752,11 +6772,21 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
index 64c49e15f79..6c673e1ac95 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
@@ -6338,11 +6338,21 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
@@ -6545,11 +6555,21 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
@@ -6752,11 +6772,21 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
index 84caa8d8c60..58925b3024e 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
@@ -6338,11 +6338,21 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/direct/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
@@ -6545,11 +6555,21 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");
@@ -6752,11 +6772,21 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFun.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClass.kt");
                 }
 
+                @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt")
+                public void testCovariantOverrideSuspendFunWithNullableInlineClassSameJvmType() throws Exception {
+                    runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClassSameJvmType.kt");
+                }
+
                 @TestMetadata("covariantOverrideSuspendFunWithNullableInlineClass_Any.kt")
                 public void testCovariantOverrideSuspendFunWithNullableInlineClass_Any() throws Exception {
                     runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/covariantOverrideSuspendFunWithNullableInlineClass_Any.kt");