Skip to content

Commit c703b86

Browse files
committed
fix build
1 parent 7184d3f commit c703b86

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/JcInstListBuilder.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ package org.jacodb.impl.cfg
1919
import org.jacodb.api.*
2020
import org.jacodb.api.cfg.*
2121
import org.jacodb.api.ext.*
22-
import org.jacodb.impl.cfg.util.LAMBDA_METAFACTORY_CLASS
2322
import org.jacodb.impl.cfg.util.UNINIT_THIS
24-
import org.jacodb.impl.cfg.util.typeName
23+
import org.jacodb.impl.cfg.util.lambdaMetaFactory
24+
import org.jacodb.impl.cfg.util.lambdaMetaFactoryMethodName
2525

2626
/** This class stores state and is NOT THREAD SAFE. Use it carefully */
2727
class JcInstListBuilder(val method: JcMethod,val instList: JcInstList<JcRawInst>) : JcRawInstVisitor<JcInst?>, JcRawExprVisitor<JcExpr> {
@@ -261,9 +261,6 @@ class JcInstListBuilder(val method: JcMethod,val instList: JcInstList<JcRawInst>
261261
override fun visitJcRawInstanceOfExpr(expr: JcRawInstanceOfExpr): JcExpr =
262262
JcInstanceOfExpr(classpath.boolean, expr.operand.accept(this) as JcValue, expr.targetType.asType())
263263

264-
private val lambdaMetaFactory: TypeName by lazy { LAMBDA_METAFACTORY_CLASS.typeName() }
265-
private val lambdaMetaFactoryMethodName: String = "metafactory"
266-
267264
override fun visitJcRawDynamicCallExpr(expr: JcRawDynamicCallExpr): JcExpr {
268265
if (expr.bsm.declaringClass == lambdaMetaFactory && expr.bsm.name == lambdaMetaFactoryMethodName) {
269266
val lambdaExpr = tryResolveJcLambdaExpr(expr)

jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/util/types.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,6 @@ internal fun TypeName.baseElementType(): TypeName {
8383
} while (next != null)
8484
return current!!
8585
}
86+
87+
val lambdaMetaFactory: TypeName = LAMBDA_METAFACTORY_CLASS.typeName()
88+
val lambdaMetaFactoryMethodName: String = "metafactory"

0 commit comments

Comments
 (0)