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

[COROUTINE] NPE exception fix if no DebugMetadata in target jvm exists

Browse Source
This commit is contained in:
Vladimir Ilmov
2020-01-30 12:49:39 +01:00
parent 7175e5a927
commit c804190f36
1 changed files with 31 additions and 15 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/AsyncStackTraceContext.kt
+31 -15
View File
@@ -27,9 +27,6 @@ class AsyncStackTraceContext(
val method: Method
) {
val log by logger
val debugMetadataKtType = context.findClassSafe(
DEBUG_METADATA_KT
)!!
private companion object {
const val DEBUG_METADATA_KT = "kotlin.coroutines.jvm.internal.DebugMetadataKt"
@@ -76,20 +73,33 @@ class AsyncStackTraceContext(
val continuationType = continuation.referenceType() as? ClassType ?: return
val baseContinuationSupertype = findBaseContinuationSuperSupertype(continuationType) ?: return
val location = createLocation(continuation)
val debugMetadataKtType = debugMetadataKtType()
if (debugMetadataKtType is ClassType) {
val location = createLocation(continuation, debugMetadataKtType)
location?.let {
val spilledVariables = getSpilledVariables(continuation) ?: emptyList()
consumer.add(DefaultCoroutineStackFrameItem(location, spilledVariables))
location?.let {
val spilledVariables = getSpilledVariables(continuation, debugMetadataKtType) ?: emptyList()
consumer.add(DefaultCoroutineStackFrameItem(location, spilledVariables))
}
val completionField = baseContinuationSupertype.fieldByName("completion") ?: return
val completion = continuation.getValue(completionField) as? ObjectReference ?: return
collectFramesRecursively(completion, consumer)
}
val completionField = baseContinuationSupertype.fieldByName("completion") ?: return
val completion = continuation.getValue(completionField) as? ObjectReference ?: return
collectFramesRecursively(completion, consumer)
}
private fun createLocation(continuation: ObjectReference): GeneratedLocation? {
val instance = invokeGetStackTraceElement(continuation) ?: return null
fun debugMetadataKtType(): ClassType? {
val debugMetadataKtType = context.findClassSafe(DEBUG_METADATA_KT)
if (debugMetadataKtType != null) {
return debugMetadataKtType
} else {
log.warn("Continuation information found but no $DEBUG_METADATA_KT class exists. Please check kotlin-stdlib version.")
}
return null
}
private fun createLocation(continuation: ObjectReference, debugMetadataKtType: ClassType): GeneratedLocation? {
val instance = invokeGetStackTraceElement(continuation, debugMetadataKtType) ?: return null
val className = context.invokeMethodAsString(instance, "getClassName") ?: return null
val methodName = context.invokeMethodAsString(instance, "getMethodName") ?: return null
val lineNumber = context.invokeMethodAsInt(instance, "getLineNumber")?.takeIf {
@@ -99,10 +109,10 @@ class AsyncStackTraceContext(
return GeneratedLocation(context.debugProcess, locationClass, methodName, lineNumber)
}
private fun invokeGetStackTraceElement(continuation: ObjectReference): ObjectReference? {
private fun invokeGetStackTraceElement(continuation: ObjectReference, debugMetadataKtType: ClassType): ObjectReference? {
val stackTraceElement =
context.invokeMethodAsObject(debugMetadataKtType, "getStackTraceElement", continuation) ?: return null
// redundant i believe
stackTraceElement.referenceType().takeIf { it.name() == StackTraceElement::class.java.name } ?: return null
context.keepReference(stackTraceElement)
@@ -110,7 +120,13 @@ class AsyncStackTraceContext(
}
fun getSpilledVariables(continuation: ObjectReference): List<XNamedValue>? {
debugMetadataKtType()?.let {
return getSpilledVariables(continuation, it)
}
return null
}
fun getSpilledVariables(continuation: ObjectReference, debugMetadataKtType: ClassType): List<XNamedValue>? {
val rawSpilledVariables =
context.invokeMethodAsArray(
debugMetadataKtType,