Skip to content

Commit 2086f5b

Browse files
committed
Avoid <clinit> call in JcField.fieldId
1 parent c8665bc commit 2086f5b

File tree

1 file changed

+2
-2
lines changed
  • utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/converter

1 file changed

+2
-2
lines changed

utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/converter/ConverterUtils.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import org.jacodb.api.ext.toType
2323
import org.usvm.instrumentation.testcase.api.UTestInst
2424
import org.usvm.instrumentation.testcase.descriptor.UTestObjectDescriptor
2525
import org.usvm.instrumentation.testcase.descriptor.UTestValueDescriptor
26+
import org.usvm.instrumentation.util.getFieldByName
2627
import org.usvm.instrumentation.util.toJavaClass
27-
import org.usvm.instrumentation.util.toJavaField
2828
import org.utbot.framework.plugin.api.ClassId
2929
import org.utbot.framework.plugin.api.ConstructorId
3030
import org.utbot.framework.plugin.api.ExecutableId
@@ -101,7 +101,7 @@ fun TypeName.findClassId(classpath: JcClasspath): ClassId =
101101
?: error("Can not construct classId for $this")
102102

103103
val JcField.fieldId: FieldId
104-
get() = toJavaField(utContext.classLoader)?.fieldId
104+
get() = enclosingClass.toType().toJavaClass(utContext.classLoader, initialize = false).getFieldByName(name)?.fieldId
105105
?: error("Can not construct fieldId for $this")
106106

107107
val UTestValueDescriptor.origin: UTestInst?

0 commit comments

Comments
 (0)