Fix evaluate for internal functions (KT-15854)

#KT-15854 Fixed
This commit is contained in:
Nikolay Krasko
2017-04-07 18:16:17 +03:00
parent 9eae9aa938
commit 42868b1364
6 changed files with 81 additions and 3 deletions
+21 -3
View File
@@ -204,14 +204,32 @@ class JDIEval(
}
private fun findMethod(methodDesc: MethodDescription, _class: ReferenceType = methodDesc.ownerType.asReferenceType()): Method {
val methodName = methodDesc.name
val method = when (_class) {
is ClassType ->
_class.concreteMethodByName(methodDesc.name, methodDesc.desc)
_class.concreteMethodByName(methodName, methodDesc.desc)
else ->
_class.methodsByName(methodDesc.name, methodDesc.desc).firstOrNull()
_class.methodsByName(methodName, methodDesc.desc).firstOrNull()
}
return method ?: throwBrokenCodeException(NoSuchMethodError("Method not found: $methodDesc"))
if (method != null) {
return method
}
if (methodName.contains('$')) {
// Module name can be different for internal functions during evaluation and compilation
val internalNamePrefix = methodName.substringBefore('$') + '$'
val internalMethods = _class.visibleMethods().filter {
it.name().startsWith(internalNamePrefix) && it.signature() == methodDesc.desc
}
if (!internalMethods.isEmpty()) {
return internalMethods.singleOrNull() ?:
throwBrokenCodeException(IllegalArgumentException("Several internal methods found for $methodDesc"))
}
}
throwBrokenCodeException(NoSuchMethodError("Method not found: $methodDesc"))
}
override fun invokeStaticMethod(methodDesc: MethodDescription, arguments: List<Value>): Value {
@@ -0,0 +1,8 @@
LineBreakpoint created at internalFunctionEvaluate.kt:10
Run Java
Connected to the target VM
internalFunctionEvaluate.kt:10
Compile bytecode for sc.f()
Disconnected from the target VM
Process finished with exit code 0
@@ -0,0 +1,9 @@
LineBreakpoint created at internalProperty.kt:5
Run Java
Connected to the target VM
internalProperty.kt:5
Compile bytecode for MyClass().internalVal
Compile bytecode for MyClass().internalValWithGetter
Disconnected from the target VM
Process finished with exit code 0
@@ -0,0 +1,14 @@
package internalFunctionEvaluate
class SomeClass {
internal fun f(): Int = 42
}
fun main(args: Array<String>) {
val sc = SomeClass()
//Breakpoint!
val x = 12
}
// EXPRESSION: sc.f()
// RESULT: 42: I
@@ -0,0 +1,17 @@
package internalProperty
fun main(args: Array<String>) {
//Breakpoint!
args.size
}
class MyClass {
internal val internalVal = 42
internal val internalValWithGetter: Int get() = 24
}
// EXPRESSION: MyClass().internalVal
// RESULT: 42: I
// EXPRESSION: MyClass().internalValWithGetter
// RESULT: 24: I
@@ -218,6 +218,18 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
doSingleBreakpointTest(fileName);
}
@TestMetadata("internalFunctionEvaluate.kt")
public void testInternalFunctionEvaluate() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/internalFunctionEvaluate.kt");
doSingleBreakpointTest(fileName);
}
@TestMetadata("internalProperty.kt")
public void testInternalProperty() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/internalProperty.kt");
doSingleBreakpointTest(fileName);
}
@TestMetadata("kt12206BasePropertyWithoutBackingField.kt")
public void testKt12206BasePropertyWithoutBackingField() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/kt12206BasePropertyWithoutBackingField.kt");