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

[JVM] Extend stepping tests with <clinit> stepping.

Browse Source 
In addition, made the stepping information for constructor calls
consistent across JVM_IR and JVM. For JVM_IR that stepping behavior
is consistent for enum constructor calls in <clinit> for JVM it
is not.
This commit is contained in:
Mads Ager
2020-06-24 17:06:50 +02:00
committed by max-kammerer
parent 2693664aa7
commit c3b5b21845
8 changed files with 131 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/debugInformation/AbstractDebugTest.kt
+31
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.codegen.debugInformation
import com.intellij.openapi.util.SystemInfo
import com.intellij.util.PathUtil
import com.intellij.util.SystemProperties
import com.sun.jdi.AbsentInformationException
import com.sun.jdi.VirtualMachine
import com.sun.jdi.event.*
import com.sun.jdi.request.EventRequest
@@ -194,13 +195,22 @@ abstract class AbstractDebugTest : CodegenTestCase() {
is MethodEntryEvent -> {
if (!inBoxMethod && event.location().method().name() == BOX_METHOD) {
if (manager.stepRequests().isEmpty()) {
// Create line stepping request to get all normal line steps starting now.
val stepReq = manager.createStepRequest(event.thread(), StepRequest.STEP_LINE, StepRequest.STEP_INTO)
stepReq.setSuspendPolicy(SUSPEND_ALL)
stepReq.addClassExclusionFilter("java.*")
stepReq.addClassExclusionFilter("sun.*")
stepReq.addClassExclusionFilter("kotlin.*")
// Create class prepare request to be able to set breakpoints on class initializer lines.
// There are no line stepping events for class initializers, so we depend on breakpoints.
val prepareReq = manager.createClassPrepareRequest()
prepareReq.setSuspendPolicy(SUSPEND_ALL)
prepareReq.addClassExclusionFilter("java.*")
prepareReq.addClassExclusionFilter("sun.*")
prepareReq.addClassExclusionFilter("kotlin.*")
}
manager.stepRequests().map { it.enable() }
manager.classPrepareRequests().map { it.enable() }
inBoxMethod = true
storeStep(loggedItems, event)
}
@@ -209,6 +219,8 @@ abstract class AbstractDebugTest : CodegenTestCase() {
// Handle the case where an Exception causing program to exit without MethodExitEvent.
if (inBoxMethod && event.location().method().name() == "run") {
manager.stepRequests().map { it.disable() }
manager.classPrepareRequests().map { it.disable() }
manager.breakpointRequests().map { it.disable() }
break@vmLoop
}
if (inBoxMethod) {
@@ -218,9 +230,28 @@ abstract class AbstractDebugTest : CodegenTestCase() {
is MethodExitEvent -> {
if (event.location().method().name() == BOX_METHOD) {
manager.stepRequests().map { it.disable() }
manager.classPrepareRequests().map { it.disable() }
manager.breakpointRequests().map { it.disable() }
break@vmLoop
}
}
is ClassPrepareEvent -> {
if (inBoxMethod) {
val initializer = event.referenceType().methods().find { it.isStaticInitializer }
try {
initializer?.allLineLocations()?.forEach {
manager.createBreakpointRequest(it).enable()
}
} catch (e: AbsentInformationException) {
// If there is no line information, do not set breakpoints.
}
}
}
is BreakpointEvent -> {
if (inBoxMethod) {
storeStep(loggedItems, event)
}
}
else -> {
throw IllegalStateException("event not handled: $event")
}