From e8597d706dcf6e31ca9a61ae06818ed24b51fb8a Mon Sep 17 00:00:00 2001
From: Ilmir Usmanov <ilmir.usmanov@jetbrains.com>
Date: Wed, 22 Aug 2018 20:41:08 +0300
Subject: [PATCH] Implement debug-friendly Continuation.toString()

 #KT-18986 Fixed
---
 compiler/testData/codegen/box/coroutines/coroutineToString.kt  | 2 +-
 .../jvm/src/kotlin/coroutines/jvm/internal/ContinuationImpl.kt | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/compiler/testData/codegen/box/coroutines/coroutineToString.kt b/compiler/testData/codegen/box/coroutines/coroutineToString.kt
index d50ddb527d9..3f5861cd46d 100644
--- a/compiler/testData/codegen/box/coroutines/coroutineToString.kt
+++ b/compiler/testData/codegen/box/coroutines/coroutineToString.kt
@@ -31,5 +31,5 @@ fun box(): String {
         result = A<String>().bar()
     }
 
-    return if (result == "Continuation @ A\$bar\$1") "OK" else "Fail: $result"
+    return if (result == "Continuation at A.bar(coroutineToString.kt:16)") "OK" else "Fail: $result"
 }
diff --git a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/ContinuationImpl.kt b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/ContinuationImpl.kt
index 3a9f31bb9a7..adb2b7be709 100644
--- a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/ContinuationImpl.kt
+++ b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/ContinuationImpl.kt
@@ -64,8 +64,7 @@ internal abstract class BaseContinuationImpl(
     }
 
     public override fun toString(): String {
-        // todo: how continuation shall be rendered?
-        return "Continuation @ ${this::class.java.name}"
+        return "Continuation at ${getStackTraceElement() ?: this::class.java.name}"
     }
 }