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

(CoroutineDebugger) Keep coroutine info list reference from collection

Browse Source 
#KT-38606 Fixed
This commit is contained in:
Vladimir Ilmov
2020-05-12 11:23:00 +02:00
parent 5a5c1c3420
commit 385ddba2d9
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/proxy/mirror/coroutinesDebugMirror.kt
+1 -1
View File
@@ -42,7 +42,7 @@ class DebugProbesImpl private constructor(context: DefaultExecutionContext) :
fun dumpCoroutinesInfo(context: DefaultExecutionContext): List<MirrorOfCoroutineInfo> { fun dumpCoroutinesInfo(context: DefaultExecutionContext): List<MirrorOfCoroutineInfo> {
instance ?: return emptyList() instance ?: return emptyList()
val coroutinesInfoReference = objectValue(instance, dumpMethod, context) val coroutinesInfoReference = context.keepReference(objectValue(instance, dumpMethod, context))
val referenceList = javaLangListMirror.mirror(coroutinesInfoReference, context) ?: return emptyList() val referenceList = javaLangListMirror.mirror(coroutinesInfoReference, context) ?: return emptyList()
return referenceList.values.mapNotNull { coroutineInfo.mirror(it, context) } return referenceList.values.mapNotNull { coroutineInfo.mirror(it, context) }
} }
idea/jvm-debugger/jvm-debugger-util/src/org/jetbrains/kotlin/idea/debugger/evaluate/ExecutionContext.kt
+7
View File
@@ -42,6 +42,13 @@ class DefaultExecutionContext(evaluationContext: EvaluationContextImpl) : BaseEx
val frameProxy: StackFrameProxyImpl? val frameProxy: StackFrameProxyImpl?
get() = get() =
evaluationContext.frameProxy evaluationContext.frameProxy
fun keepReference(ref: ObjectReference?): ObjectReference? {
ref?.let {
super.keepReference(ref)
}
return ref
}
} }
sealed class BaseExecutionContext(val evaluationContext: EvaluationContextImpl) { sealed class BaseExecutionContext(val evaluationContext: EvaluationContextImpl) {