azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Async stack traces: fix compatibility with kotlin-stdlib 1.2.70 (KT-30611)

Browse Source
This commit is contained in:
Yan Zhulanow
2019-03-27 21:29:06 +03:00
parent ef06009669
commit 69353ee9bf
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/KotlinCoroutinesAsyncStackTraceProvider.kt
+6 -1
View File
@@ -54,7 +54,12 @@ class KotlinCoroutinesAsyncStackTraceProvider : KotlinCoroutinesAsyncStackTraceP
val evaluationContext = EvaluationContextImpl(suspendContext, frameProxy) val evaluationContext = EvaluationContextImpl(suspendContext, frameProxy)
val context = ExecutionContext(evaluationContext, frameProxy) val context = ExecutionContext(evaluationContext, frameProxy)
val debugMetadataKtType = context.findClass(DEBUG_METADATA_KT) as? ClassType ?: return null val debugMetadataKtType = try {
context.findClass(DEBUG_METADATA_KT) as? ClassType
} catch (e: Throwable) {
// DebugMetadataKt not found, probably old kotlin-stdlib version
return null
} ?: return null
val asyncContext = AsyncStackTraceContext(context, method, debugMetadataKtType) val asyncContext = AsyncStackTraceContext(context, method, debugMetadataKtType)
return asyncContext.getAsyncStackTraceForSuspendLambda() ?: asyncContext.getAsyncStackTraceForSuspendFunction() return asyncContext.getAsyncStackTraceForSuspendLambda() ?: asyncContext.getAsyncStackTraceForSuspendFunction()