m

vorpal-research · May 23, 2024 · 8121e73 · 8121e73
1 parent 93500e7
commit 8121e73
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 27 deletions.
diff --git a/kex-core/src/main/kotlin/org/vorpal/research/kex/asm/manager/MethodWrapper.kt b/kex-core/src/main/kotlin/org/vorpal/research/kex/asm/manager/MethodWrapper.kt
@@ -7,7 +7,7 @@ import org.vorpal.research.kfg.ir.value.NameMapper
 import org.vorpal.research.kfg.ir.value.Value
 import org.vorpal.research.kfg.type.parseStringToType
 import org.vorpal.research.kfg.visitor.MethodVisitor
-import ru.spbstu.wheels.mapToArray
+import org.vorpal.research.kthelper.collection.mapToArray
 
 @JvmInline
 value class ValueWrapper(

diff --git a/kex-core/src/main/kotlin/org/vorpal/research/kex/descriptor/descriptor.kt b/kex-core/src/main/kotlin/org/vorpal/research/kex/descriptor/descriptor.kt
@@ -375,7 +375,7 @@ sealed class AbstractFieldContainingDescriptor(
         return fieldsQuery(set)
     }
 
-    protected fun fieldsQuery(set: MutableSet<Descriptor>) = basic {
+    private fun fieldsQuery(set: MutableSet<Descriptor>) = basic {
         axiom { term inequality null }
         for ((field, value) in fields) {
             val fieldTerm = term.field(field.second, field.first)

diff --git a/kex-core/src/main/kotlin/org/vorpal/research/kex/ktype/KexType.kt b/kex-core/src/main/kotlin/org/vorpal/research/kex/ktype/KexType.kt
@@ -31,8 +31,8 @@ import org.vorpal.research.kfg.type.objectType
 import org.vorpal.research.kfg.util.Flags
 import org.vorpal.research.kthelper.assert.ktassert
 import org.vorpal.research.kthelper.assert.unreachable
+import org.vorpal.research.kthelper.collection.mapToArray
 import org.vorpal.research.kthelper.logging.log
-import ru.spbstu.wheels.mapToArray
 import kotlin.reflect.KClass
 import org.vorpal.research.kfg.ir.Class as KfgClass
 import org.vorpal.research.kfg.ir.Field as KfgField

diff --git a/kex-core/src/main/kotlin/org/vorpal/research/kex/state/transformer/ConstEnumAdapter.kt b/kex-core/src/main/kotlin/org/vorpal/research/kex/state/transformer/ConstEnumAdapter.kt
@@ -25,7 +25,7 @@ import org.vorpal.research.kex.util.loadClass
 import org.vorpal.research.kfg.type.ClassType
 import org.vorpal.research.kthelper.assert.ktassert
 import org.vorpal.research.kthelper.logging.log
-import org.vorpal.research.kthelper.tryOrNull
+import org.vorpal.research.kthelper.safeTry
 
 val ignores by lazy {
     kexConfig.getMultipleStringValue("inliner", "ignoreStatic")
@@ -151,9 +151,9 @@ class ConstEnumAdapter(
 
     override fun apply(ps: PredicateState): PredicateState = apply(ps, findAccessedEnums(ps))
 
-    private fun apply(ps: PredicateState, enumClasses: Set<KexType>) = tryOrNull {
+    private fun apply(ps: PredicateState, enumClasses: Set<KexType>) = safeTry {
         mapEnumTerms(ps, enumClasses).simplify()
-    } ?: ps
+    }.getOrDefault(ps)
 
     override fun apply(state: IncrementalPredicateState): IncrementalPredicateState {
         val enumConstantsMap = buildSet {

diff --git a/kex-core/src/main/kotlin/org/vorpal/research/kex/state/transformer/KexRtAdapter.kt b/kex-core/src/main/kotlin/org/vorpal/research/kex/state/transformer/KexRtAdapter.kt
@@ -24,7 +24,7 @@ import org.vorpal.research.kex.state.term.ValueTerm
 import org.vorpal.research.kfg.ClassManager
 import org.vorpal.research.kfg.ir.Field
 import org.vorpal.research.kfg.ir.Location
-import ru.spbstu.wheels.mapToArray
+import org.vorpal.research.kthelper.collection.mapToArray
 
 fun FieldTerm.unmappedKfgField(cm: ClassManager): Field {
     val kfgKlass = cm[this.klass]

diff --git a/kex-core/src/main/kotlin/org/vorpal/research/kex/util/ClassLoaderWithMockitoWorkaround.kt b/kex-core/src/main/kotlin/org/vorpal/research/kex/util/ClassLoaderWithMockitoWorkaround.kt
@@ -3,8 +3,8 @@ package org.vorpal.research.kex.util
 import org.vorpal.research.kex.config.kexConfig
 import org.vorpal.research.kex.mocking.isMockitoJava8WorkaroundEnabled
 import org.vorpal.research.kthelper.logging.info
-import org.vorpal.research.kthelper.logging.warn
 import org.vorpal.research.kthelper.logging.log
+import org.vorpal.research.kthelper.logging.warn
 import org.vorpal.research.kthelper.tryOrNull
 
 sealed class ClassLoaderWithMockitoWorkaround(parent: ClassLoader = getSystemClassLoader()) :
@@ -22,9 +22,7 @@ sealed class ClassLoaderWithMockitoWorkaround(parent: ClassLoader = getSystemCla
         }
     }
 
-    private fun applyJava8MockitoWorkaround(): Boolean {
-        return tryOrNull {
-            definePackage("org.mockito.codegen", "", "", "", "", "", "", null)
-        } != null
-    }
-}
+    private fun applyJava8MockitoWorkaround(): Boolean = tryOrNull {
+        definePackage("org.mockito.codegen", "", "", "", "", "", "", null)
+    } != null
+}
diff --git a/kex-executor/src/main/kotlin/org/vorpal/research/kex/launcher/WorkerLauncher.kt b/kex-executor/src/main/kotlin/org/vorpal/research/kex/launcher/WorkerLauncher.kt
@@ -11,14 +11,20 @@ import org.vorpal.research.kex.config.kexConfig
 import org.vorpal.research.kex.random.easyrandom.EasyRandomDriver
 import org.vorpal.research.kex.serialization.KexSerializer
 import org.vorpal.research.kex.trace.symbolic.protocol.Worker2MasterSocketConnection
-import org.vorpal.research.kex.util.*
+import org.vorpal.research.kex.util.KfgClassLoader
+import org.vorpal.research.kex.util.compiledCodeDirectory
+import org.vorpal.research.kex.util.getIntrinsics
+import org.vorpal.research.kex.util.getJunit
+import org.vorpal.research.kex.util.getMockito
+import org.vorpal.research.kex.util.getPathSeparator
+import org.vorpal.research.kex.util.getRuntime
 import org.vorpal.research.kex.worker.ExecutorWorker
 import org.vorpal.research.kfg.ClassManager
 import org.vorpal.research.kfg.KfgConfig
 import org.vorpal.research.kfg.container.asContainer
 import org.vorpal.research.kfg.util.Flags
+import org.vorpal.research.kthelper.collection.mapToArray
 import org.vorpal.research.kthelper.logging.log
-import ru.spbstu.wheels.mapToArray
 import java.nio.file.Files
 import java.nio.file.Paths
 import kotlin.system.exitProcess

diff --git a/kex-executor/src/main/kotlin/org/vorpal/research/kex/launcher/WorkerLauncherDebug.kt b/kex-executor/src/main/kotlin/org/vorpal/research/kex/launcher/WorkerLauncherDebug.kt
@@ -24,8 +24,8 @@ import org.vorpal.research.kfg.ClassManager
 import org.vorpal.research.kfg.KfgConfig
 import org.vorpal.research.kfg.container.asContainer
 import org.vorpal.research.kfg.util.Flags
+import org.vorpal.research.kthelper.collection.mapToArray
 import org.vorpal.research.kthelper.logging.log
-import ru.spbstu.wheels.mapToArray
 import java.nio.file.Files
 import java.nio.file.Paths
 import kotlin.system.exitProcess

diff --git a/...rc/main/kotlin/org/vorpal/research/kex/asm/analysis/crash/ExceptionReproductionChecker.kt b/...rc/main/kotlin/org/vorpal/research/kex/asm/analysis/crash/ExceptionReproductionChecker.kt
@@ -5,8 +5,8 @@ import org.vorpal.research.kex.config.kexConfig
 import org.vorpal.research.kex.util.compiledCodeDirectory
 import org.vorpal.research.kex.util.getJunit
 import org.vorpal.research.kthelper.assert.unreachable
+import org.vorpal.research.kthelper.collection.mapToArray
 import org.vorpal.research.kthelper.logging.log
-import ru.spbstu.wheels.mapToArray
 import java.io.PrintWriter
 import java.io.StringWriter
 import java.lang.reflect.InvocationTargetException

diff --git a/...ner/src/main/kotlin/org/vorpal/research/kex/asm/analysis/symbolic/SymbolicCallResolver.kt b/...ner/src/main/kotlin/org/vorpal/research/kex/asm/analysis/symbolic/SymbolicCallResolver.kt
@@ -19,7 +19,7 @@ import org.vorpal.research.kfg.ir.value.instruction.HandleBsmArgument
 import org.vorpal.research.kfg.ir.value.instruction.InvokeDynamicInst
 import org.vorpal.research.kfg.stringClass
 import org.vorpal.research.kfg.type.ClassType
-import ru.spbstu.wheels.mapToArray
+import org.vorpal.research.kthelper.collection.mapToArray
 
 
 interface SymbolicCallResolver {

diff --git a/kex-runner/src/main/kotlin/org/vorpal/research/kex/compile/CompilerHelper.kt b/kex-runner/src/main/kotlin/org/vorpal/research/kex/compile/CompilerHelper.kt
@@ -6,7 +6,7 @@ import org.vorpal.research.kex.util.compiledCodeDirectory
 import org.vorpal.research.kex.util.getJunit
 import org.vorpal.research.kex.util.getMockito
 import org.vorpal.research.kex.util.testcaseDirectory
-import ru.spbstu.wheels.mapToArray
+import org.vorpal.research.kthelper.collection.mapToArray
 import java.nio.file.Path
 
 class CompilerHelper(val ctx: ExecutionContext) {

diff --git a/kex-runner/src/main/kotlin/org/vorpal/research/kex/launcher/AnalysisLevel.kt b/kex-runner/src/main/kotlin/org/vorpal/research/kex/launcher/AnalysisLevel.kt
@@ -10,7 +10,7 @@ import org.vorpal.research.kfg.ir.Class
 import org.vorpal.research.kfg.ir.ConcreteClass
 import org.vorpal.research.kfg.ir.Method
 import org.vorpal.research.kfg.type.parseStringToType
-import ru.spbstu.wheels.mapToArray
+import org.vorpal.research.kthelper.collection.mapToArray
 
 sealed class AnalysisLevel {
     abstract val pkg: Package

diff --git a/kex-runner/src/main/kotlin/org/vorpal/research/kex/launcher/CrashReproductionLauncher.kt b/kex-runner/src/main/kotlin/org/vorpal/research/kex/launcher/CrashReproductionLauncher.kt
@@ -21,8 +21,8 @@ import org.vorpal.research.kfg.container.Container
 import org.vorpal.research.kfg.container.asContainer
 import org.vorpal.research.kfg.util.Flags
 import org.vorpal.research.kfg.visitor.executePackagePipeline
+import org.vorpal.research.kthelper.collection.mapToArray
 import org.vorpal.research.kthelper.logging.log
-import ru.spbstu.wheels.mapToArray
 import java.nio.file.Paths
 import kotlin.io.path.exists
 import kotlin.io.path.readText

diff --git a/kex-runner/src/main/kotlin/org/vorpal/research/kex/launcher/KexAnalysisLauncher.kt b/kex-runner/src/main/kotlin/org/vorpal/research/kex/launcher/KexAnalysisLauncher.kt
@@ -19,8 +19,8 @@ import org.vorpal.research.kfg.visitor.executeClassPipeline
 import org.vorpal.research.kfg.visitor.executeMethodPipeline
 import org.vorpal.research.kfg.visitor.executePackagePipeline
 import org.vorpal.research.kthelper.KtException
+import org.vorpal.research.kthelper.collection.mapToArray
 import org.vorpal.research.kthelper.logging.log
-import ru.spbstu.wheels.mapToArray
 import java.nio.file.Paths
 
 

diff --git a/...unner/src/main/kotlin/org/vorpal/research/kex/reanimator/actionsequence/ActionSequence.kt b/...unner/src/main/kotlin/org/vorpal/research/kex/reanimator/actionsequence/ActionSequence.kt
@@ -11,9 +11,9 @@ import org.vorpal.research.kfg.ir.Field
 import org.vorpal.research.kfg.ir.Method
 import org.vorpal.research.kfg.type.ArrayType
 import org.vorpal.research.kfg.type.Type
+import org.vorpal.research.kthelper.collection.mapToArray
 import org.vorpal.research.kthelper.collection.queueOf
 import org.vorpal.research.kthelper.logging.log
-import ru.spbstu.wheels.mapToArray
 
 sealed class ActionSequence(val name: String) {
     open val isConstantValue: Boolean get() = false

diff --git a/...c/main/kotlin/org/vorpal/research/kex/reanimator/actionsequence/ActionSequenceExecutor.kt b/...c/main/kotlin/org/vorpal/research/kex/reanimator/actionsequence/ActionSequenceExecutor.kt
@@ -10,10 +10,10 @@ import org.vorpal.research.kex.util.isFinal
 import org.vorpal.research.kex.util.loadClass
 import org.vorpal.research.kex.util.runWithTimeout
 import org.vorpal.research.kthelper.assert.unreachable
+import org.vorpal.research.kthelper.collection.mapToArray
 import org.vorpal.research.kthelper.logging.error
 import org.vorpal.research.kthelper.logging.log
 import org.vorpal.research.kthelper.tryOrNull
-import ru.spbstu.wheels.mapToArray
 import java.lang.reflect.Array
 import java.lang.reflect.Field
 

diff --git a/kex-runner/src/main/kotlin/org/vorpal/research/kex/trace/file/trace.kt b/kex-runner/src/main/kotlin/org/vorpal/research/kex/trace/file/trace.kt
@@ -6,9 +6,9 @@ import org.vorpal.research.kex.trace.AbstractTrace
 import org.vorpal.research.kfg.ir.BasicBlock
 import org.vorpal.research.kfg.ir.Method
 import org.vorpal.research.kthelper.assert.ktassert
+import org.vorpal.research.kthelper.collection.mapToArray
 import org.vorpal.research.kthelper.logging.error
 import org.vorpal.research.kthelper.logging.log
-import ru.spbstu.wheels.mapToArray
 import java.util.*
 
 data class BlockInfo internal constructor(

diff --git a/...ner/src/main/kotlin/org/vorpal/research/kex/trace/runner/SymbolicExternalTracingRunner.kt b/...ner/src/main/kotlin/org/vorpal/research/kex/trace/runner/SymbolicExternalTracingRunner.kt
@@ -18,10 +18,10 @@ import org.vorpal.research.kex.util.getPathSeparator
 import org.vorpal.research.kex.util.kexHome
 import org.vorpal.research.kex.util.outputDirectory
 import org.vorpal.research.kthelper.buildProcess
+import org.vorpal.research.kthelper.collection.mapToArray
 import org.vorpal.research.kthelper.logging.log
 import org.vorpal.research.kthelper.nullFile
 import org.vorpal.research.kthelper.terminateOrKill
-import ru.spbstu.wheels.mapToArray
 import java.nio.file.Paths
 import kotlin.concurrent.thread
 import kotlin.time.Duration.Companion.milliseconds