Skip to content

Commit 467427c

Browse files
DaniilStepanovEgorkaKulikov
authored andcommitted
minor
1 parent 244ef44 commit 467427c

File tree

1 file changed

+6
-6
lines changed
  • usvm-jvm-instrumentation/src/main/kotlin/org/usvm/instrumentation/util

1 file changed

+6
-6
lines changed

usvm-jvm-instrumentation/src/main/kotlin/org/usvm/instrumentation/util/Jacodb.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ val JcInst.enclosingClass
4747
val JcInst.enclosingMethod
4848
get() = this.location.method
4949

50-
fun JcType.toJavaClass(classLoader: ClassLoader): Class<*> =
50+
fun JcType.toJavaClass(classLoader: ClassLoader, initialize: Boolean = true): Class<*> =
5151
when (this) {
5252
is JcPrimitiveType -> toJavaClass()
53-
is JcArrayType -> findClassInLoader(toJvmType(), classLoader)
54-
is JcClassType -> this.jcClass.toJavaClass(classLoader)
55-
else -> findClassInLoader(typeName, classLoader)
53+
is JcArrayType -> findClassInLoader(toJvmType(), classLoader, initialize)
54+
is JcClassType -> this.jcClass.toJavaClass(classLoader, initialize)
55+
else -> findClassInLoader(typeName, classLoader, initialize)
5656
}
5757

5858
private fun JcPrimitiveType.toJavaClass(): Class<*> {
@@ -104,11 +104,11 @@ fun JcType.toJcClass(): JcClassOrInterface? =
104104
else -> error("Unexpected type")
105105
}
106106

107-
fun JcClassOrInterface.toJavaClass(classLoader: ClassLoader, initialize: Boolean = false): Class<*> =
107+
fun JcClassOrInterface.toJavaClass(classLoader: ClassLoader, initialize: Boolean = true): Class<*> =
108108
findClassInLoader(name, classLoader, initialize)
109109

110110

111-
fun findClassInLoader(name: String, classLoader: ClassLoader, initialize: Boolean = false): Class<*> =
111+
fun findClassInLoader(name: String, classLoader: ClassLoader, initialize: Boolean = true): Class<*> =
112112
try {
113113
Class.forName(name, initialize, classLoader)
114114
} catch (e: Throwable) {

0 commit comments

Comments
 (0)