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

Debugger: evaluate Ref$element to element value

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-09-29 14:17:07 +03:00
parent 77f1a3a7f3
commit c98ebffbcf
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/FrameVisitor.kt
+1 -1
View File
@@ -179,7 +179,7 @@ class FrameVisitor(context: EvaluationContextImpl) {
return this.asmType.getSort() == Type.OBJECT && this.asmType.getInternalName().startsWith(AsmTypes.REF_TYPE_PREFIX) return this.asmType.getSort() == Type.OBJECT && this.asmType.getInternalName().startsWith(AsmTypes.REF_TYPE_PREFIX)
} }
private fun getValueIfSharedVar(value: Value, expectedType: Type?, checkType: Boolean): Value? { fun getValueIfSharedVar(value: Value, expectedType: Type?, checkType: Boolean): Value? {
if (!value.isSharedVar()) return null if (!value.isSharedVar()) return null
val sharedVarValue = getField(value, "element", expectedType, checkType) val sharedVarValue = getField(value, "element", expectedType, checkType)
idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
+7 -6
View File
@@ -139,14 +139,12 @@ class KotlinEvaluator(val codeFragment: KtCodeFragment,
} }
val result = runEval4j(context, compiledData) val result = runEval4j(context, compiledData)
val virtualMachine = context.debugProcess.virtualMachineProxy.virtualMachine
// If bytecode was taken from cache and exception was thrown - recompile bytecode and run eval4j again // If bytecode was taken from cache and exception was thrown - recompile bytecode and run eval4j again
if (isCompiledDataFromCache && result is ExceptionThrown && result.kind == ExceptionThrown.ExceptionKind.BROKEN_CODE) { if (isCompiledDataFromCache && result is ExceptionThrown && result.kind == ExceptionThrown.ExceptionKind.BROKEN_CODE) {
return runEval4j(context, extractAndCompile(codeFragment, sourcePosition, context)).toJdiValue(virtualMachine) return runEval4j(context, extractAndCompile(codeFragment, sourcePosition, context)).toJdiValue(context)
} }
return result.toJdiValue(virtualMachine) return result.toJdiValue(context)
} }
catch(e: EvaluateException) { catch(e: EvaluateException) {
throw e throw e
@@ -277,7 +275,7 @@ class KotlinEvaluator(val codeFragment: KtCodeFragment,
return argumentValue return argumentValue
} }
private fun InterpreterResult.toJdiValue(vm: VirtualMachine): com.sun.jdi.Value? { private fun InterpreterResult.toJdiValue(context: EvaluationContextImpl): com.sun.jdi.Value? {
val jdiValue = when (this) { val jdiValue = when (this) {
is ValueReturned -> result is ValueReturned -> result
is ExceptionThrown -> { is ExceptionThrown -> {
@@ -291,7 +289,10 @@ class KotlinEvaluator(val codeFragment: KtCodeFragment,
is AbnormalTermination -> exception(message) is AbnormalTermination -> exception(message)
else -> throw IllegalStateException("Unknown result value produced by eval4j") else -> throw IllegalStateException("Unknown result value produced by eval4j")
} }
return jdiValue.asJdiValue(vm, jdiValue.asmType)
val vm = context.debugProcess.virtualMachineProxy.virtualMachine
val sharedVar = FrameVisitor(context).getValueIfSharedVar(jdiValue, jdiValue.asmType, false)
return sharedVar?.asJdiValue(vm, sharedVar.asmType) ?: jdiValue.asJdiValue(vm, jdiValue.asmType)
} }
private fun ExtractionResult.getParametersForDebugger(fragment: KtCodeFragment): ParametersDescriptor { private fun ExtractionResult.getParametersForDebugger(fragment: KtCodeFragment): ParametersDescriptor {