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

JDIEval: fix ClassNotLoadedException

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-09-24 14:22:06 +03:00
parent d83ed11cd9
commit dc7ced1581
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt
+11 -10
View File
@@ -17,21 +17,18 @@
package org.jetbrains.eval4j.jdi package org.jetbrains.eval4j.jdi
import com.sun.jdi.* import com.sun.jdi.*
import com.sun.jdi.Value as jdi_Value
import com.sun.jdi.Type as jdi_Type
import com.sun.jdi.ClassNotLoadedException
import com.sun.jdi.Method
import com.sun.jdi.ObjectReference
import org.jetbrains.eval4j.* import org.jetbrains.eval4j.*
import org.jetbrains.eval4j.Value import org.jetbrains.eval4j.Value
import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.Type
import com.sun.jdi.Type as jdi_Type
import com.sun.jdi.Value as jdi_Value
val CLASS = Type.getType(javaClass<Class<*>>()) val CLASS = Type.getType(javaClass<Class<*>>())
val BOOTSTRAP_CLASS_DESCRIPTORS = setOf("Ljava/lang/String;", "Ljava/lang/ClassLoader;", "Ljava/lang/Class;") val BOOTSTRAP_CLASS_DESCRIPTORS = setOf("Ljava/lang/String;", "Ljava/lang/ClassLoader;", "Ljava/lang/Class;")
public class JDIEval( public class JDIEval(
private val vm: VirtualMachine, private val vm: VirtualMachine,
private val classLoader: ClassLoaderReference?, private val defaultClassLoader: ClassLoaderReference?,
private val thread: ThreadReference, private val thread: ThreadReference,
private val invokePolicy: Int private val invokePolicy: Int
) : Eval { ) : Eval {
@@ -48,6 +45,10 @@ public class JDIEval(
) )
override fun loadClass(classType: Type): Value { override fun loadClass(classType: Type): Value {
return loadClass(classType, defaultClassLoader)
}
fun loadClass(classType: Type, classLoader: ClassLoaderReference?): Value {
val loadedClasses = vm.classesByName(classType.getInternalName()) val loadedClasses = vm.classesByName(classType.getInternalName())
if (!loadedClasses.isEmpty()) { if (!loadedClasses.isEmpty()) {
val loadedClass = loadedClasses[0] val loadedClass = loadedClasses[0]
@@ -106,8 +107,8 @@ public class JDIEval(
listOf(value)).boolean listOf(value)).boolean
} }
fun Type.asReferenceType(): ReferenceType = loadClass(this).jdiClass!!.reflectedType() fun Type.asReferenceType(classLoader: ClassLoaderReference? = this@JDIEval.defaultClassLoader): ReferenceType = loadClass(this, classLoader).jdiClass!!.reflectedType()
fun Type.asArrayType(): ArrayType = asReferenceType() as ArrayType fun Type.asArrayType(classLoader: ClassLoaderReference? = this@JDIEval.defaultClassLoader): ArrayType = asReferenceType(classLoader) as ArrayType
override fun newArray(arrayType: Type, size: Int): Value { override fun newArray(arrayType: Type, size: Int): Value {
val jdiArrayType = arrayType.asArrayType() val jdiArrayType = arrayType.asArrayType()
@@ -331,12 +332,12 @@ public class JDIEval(
val dimensions = name.count { it == '[' } val dimensions = name.count { it == '[' }
val baseTypeName = if (dimensions > 0) name.substring(0, name.indexOf('[')) else name val baseTypeName = if (dimensions > 0) name.substring(0, name.indexOf('[')) else name
val baseType = primitiveTypes[baseTypeName] ?: Type.getType("L$baseTypeName;").asReferenceType() val baseType = primitiveTypes[baseTypeName] ?: Type.getType("L$baseTypeName;").asReferenceType(declaringType().classLoader())
if (dimensions == 0) if (dimensions == 0)
baseType baseType
else else
Type.getType("[".repeat(dimensions) + baseType.asType().getDescriptor()).asReferenceType() Type.getType("[".repeat(dimensions) + baseType.asType().getDescriptor()).asReferenceType(declaringType().classLoader())
} }
} }
} }