~: copy slice of the stacktrace into recovered one to have knitted stacktraces

Author: qwwdfsad

core/kotlinx-coroutines-core/src/internal/Exceptions.kt

@@ -48,11 +48,31 @@ private fun <E : Throwable> recoverFromStackFrame(exception: E, continuation: Co
     val newException = tryCopyException(exception) ?: return exception
     val stacktrace = createStackTrace(continuation)
     if (stacktrace.isEmpty()) return exception
+    val copied = meaningfulActualStackTrace(exception)
     stacktrace.add(0, artificialFrame("Current coroutine stacktrace"))
-    newException.stackTrace = stacktrace.toTypedArray()
+    newException.stackTrace = (copied + stacktrace).toTypedArray() // TODO optimizable
     return newException
 }
 
+/*
+ * Returns slice of the original stacktrace from the original exception.
+ * E.g. for
+ * at kotlinx.coroutines.PlaygroundKt.foo(PlaygroundKt.kt:14)
+ * at kotlinx.coroutines.PlaygroundKt$foo$1.invokeSuspend(PlaygroundKt.kt)
+ * at kotlin.coroutines.jvm.internal.BaseContinuationImpl.resumeWith(ContinuationImpl.kt:32)
+ * at kotlinx.coroutines.ResumeModeKt.resumeMode(ResumeMode.kt:67)
+ * at kotlinx.coroutines.DispatchedKt.resume(Dispatched.kt:277)
+ * at kotlinx.coroutines.DispatchedKt.dispatch(Dispatched.kt:266)
+ *
+ * first two elements will be returned.
+ */
+private fun <E : Throwable> meaningfulActualStackTrace(exception: E): List<StackTraceElement> {
+    val stackTrace = exception.stackTrace
+    val index = stackTrace.indexOfFirst { "kotlin.coroutines.jvm.internal.BaseContinuationImpl" == it.className }
+    if (index == -1) return emptyList()
+    return stackTrace.slice(0 until index)
+}
+
 
 @Suppress("NOTHING_TO_INLINE")
 internal actual suspend inline fun recoverAndThrow(exception: Throwable): Nothing {

core/kotlinx-coroutines-core/test/exceptions/StackTraceRecoveryTest.kt

@@ -31,6 +31,7 @@ class StackTraceRecoveryTest : TestBase() {
         val deferred = createDeferred(3)
         val traces = listOf(
             "java.util.concurrent.ExecutionException\n" +
+                    "\tat kotlinx.coroutines.exceptions.StackTraceRecoveryTest\$testAsync\$1\$1\$1.invokeSuspend(StackTraceRecoveryTest.kt:99)\n" +
                     "\t(Current coroutine stacktrace)\n" +
                     "\tat kotlinx.coroutines.DeferredCoroutine.await\$suspendImpl(Builders.common.kt:99)\n" +
                     "\tat kotlinx.coroutines.exceptions.StackTraceRecoveryTest.oneMoreNestedMethod(StackTraceRecoveryTest.kt:49)\n" +
@@ -53,6 +54,7 @@ class StackTraceRecoveryTest : TestBase() {
         deferred.join()
         val stacktrace = listOf(
             "java.util.concurrent.ExecutionException\n" +
+                    "\tat kotlinx.coroutines.exceptions.StackTraceRecoveryTest\$testCompletedAsync\$1\$deferred\$1.invokeSuspend(StackTraceRecoveryTest.kt:44)\n" +
                     "\t(Current coroutine stacktrace)\n" +
                     "\tat kotlinx.coroutines.DeferredCoroutine.await\$suspendImpl(Builders.common.kt:99)\n" +
                     "\tat kotlinx.coroutines.exceptions.StackTraceRecoveryTest.oneMoreNestedMethod(StackTraceRecoveryTest.kt:81)\n" +
@@ -91,6 +93,7 @@ class StackTraceRecoveryTest : TestBase() {
         channelNestedMethod(
             channel, listOf(
                 "java.lang.IllegalArgumentException\n" +
+                        "\tat kotlinx.coroutines.exceptions.StackTraceRecoveryTest\$testReceiveFromChannel\$1\$job\$1.invokeSuspend(StackTraceRecoveryTest.kt:93)\n" +
                         "\t(Current coroutine stacktrace)\n" +
                         "\tat kotlinx.coroutines.exceptions.StackTraceRecoveryTest.channelNestedMethod(StackTraceRecoveryTest.kt:110)\n" +
                         "\tat kotlinx.coroutines.exceptions.StackTraceRecoveryTest\$testReceiveFromChannel\$1.invokeSuspend(StackTraceRecoveryTest.kt:89)",
@@ -141,6 +144,7 @@ class StackTraceRecoveryTest : TestBase() {
 
         outerMethod(deferred, listOf(
             "kotlinx.coroutines.RecoverableTestException\n" +
+                "\tat kotlinx.coroutines.exceptions.StackTraceRecoveryTest\$testWithContext\$1\$deferred\$1.invokeSuspend(StackTraceRecoveryTest.kt:143)\n" +
                 "\t(Current coroutine stacktrace)\n" +
                 "\tat kotlinx.coroutines.DeferredCoroutine.await\$suspendImpl(Builders.common.kt:99)\n" +
                 "\tat kotlinx.coroutines.exceptions.StackTraceRecoveryTest.innerMethod(StackTraceRecoveryTest.kt:158)\n" +
@@ -177,6 +181,7 @@ class StackTraceRecoveryTest : TestBase() {
 
         outerScopedMethod(deferred, listOf(
             "kotlinx.coroutines.RecoverableTestException\n" +
+                    "\tat kotlinx.coroutines.exceptions.StackTraceRecoveryTest\$testCoroutineScope\$1\$deferred\$1.invokeSuspend(StackTraceRecoveryTest.kt:143)\n" +
                     "\t(Current coroutine stacktrace)\n" +
                     "\tat kotlinx.coroutines.DeferredCoroutine.await\$suspendImpl(Builders.common.kt:99)\n" +
                     "\tat kotlinx.coroutines.exceptions.StackTraceRecoveryTest.innerMethod(StackTraceRecoveryTest.kt:158)\n" +