diff --git a/jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/RawInstListBuilder.kt b/jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/RawInstListBuilder.kt index 2c0b9a7c3..b734381db 100644 --- a/jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/RawInstListBuilder.kt +++ b/jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/RawInstListBuilder.kt @@ -383,7 +383,7 @@ class RawInstListBuilder( val localTypeRefinementExprMap = localTypeRefinement as Map val localsNormalizedInstructionList = originalInstructionList.map(ExprMapper(localTypeRefinementExprMap)) - return Simplifier().simplify(method.enclosingClass.classpath, localsNormalizedInstructionList) + return Simplifier().simplify(localsNormalizedInstructionList) } private fun MutableList.ensureFirstInstIsLineNumber() { diff --git a/jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/Simplifier.kt b/jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/Simplifier.kt index ac61d5c87..cf73da2d2 100644 --- a/jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/Simplifier.kt +++ b/jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/Simplifier.kt @@ -16,7 +16,6 @@ package org.jacodb.impl.cfg -import org.jacodb.api.jvm.JcClasspath import org.jacodb.api.jvm.cfg.AbstractFullRawExprSetCollector import org.jacodb.api.jvm.cfg.JcInstList import org.jacodb.api.jvm.cfg.JcRawAssignInst @@ -41,7 +40,7 @@ import org.jacodb.impl.cfg.util.InstructionFilter * the frames merging) */ internal class Simplifier { - fun simplify(jcClasspath: JcClasspath, instList: JcInstList): JcInstList { + fun simplify(instList: JcInstList): JcInstList { // clear the assignments that are repeated inside single basic block var instructionList = cleanRepeatedAssignments(instList)