USVM-based type inference

.github/workflows/build-and-test.yml

@@ -64,7 +64,7 @@ jobs:
           DEST_DIR="arkanalyzer"
           MAX_RETRIES=10
           RETRY_DELAY=3  # Delay between retries in seconds  
-          BRANCH="neo/2024-08-16"
+          BRANCH="neo/2024-12-04"
 
           for ((i=1; i<=MAX_RETRIES; i++)); do
               git clone --depth=1 --branch $BRANCH $REPO_URL $DEST_DIR && break

.gitignore

@@ -1,6 +1,7 @@
 .idea/
 .gradle/
 build/
+.kotlin/
 idea-community
 *.db
 /generated/

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -58,20 +58,32 @@
 import java.nio.file.Files
 import java.nio.file.Path
 
-fun JcGraph.view(dotCmd: String, viewerCmd: String, viewCatchConnections: Boolean = false) {
-    Util.sh(arrayOf(viewerCmd, "file://${toFile(dotCmd, viewCatchConnections)}"))
+private const val DEFAULT_DOT_CMD = "dot"
+
+fun JcGraph.view(
+    viewerCmd: String = if (System.getProperty("os.name").lowercase().contains("windows")) "start" else "xdg-open",
+    dotCmd: String = DEFAULT_DOT_CMD,
+    viewCatchConnections: Boolean = false,
+) {
+    val path = toFile(null, dotCmd, viewCatchConnections)
+    Util.sh(arrayOf(viewerCmd, "file://$path"))
 }
 
-fun JcGraph.toFile(dotCmd: String, viewCatchConnections: Boolean = false, file: File? = null): Path {
+fun JcGraph.toFile(
+    file: File? = null,
+    dotCmd: String = DEFAULT_DOT_CMD,
+    viewCatchConnections: Boolean = false,
+): Path {
     Graph.setDefaultCmd(dotCmd)
 
     val graph = Graph("jcGraph")
 
     val nodes = mutableMapOf<JcInst, Node>()
     for ((index, inst) in instructions.withIndex()) {
+        val label = inst.toString().replace("\"", "\\\"")
         val node = Node("$index")
             .setShape(Shape.box)
-            .setLabel(inst.toString().replace("\"", "\\\""))
+            .setLabel(label)
             .setFontSize(12.0)
         nodes[inst] = node
         graph.addNode(node)
@@ -140,20 +152,31 @@
     return resultingFile
 }
 
-fun JcBlockGraph.view(dotCmd: String, viewerCmd: String) {
-    Util.sh(arrayOf(viewerCmd, "file://${toFile(dotCmd)}"))
+fun JcBlockGraph.view(
+    viewerCmd: String,
+    dotCmd: String = DEFAULT_DOT_CMD,
+) {
+    val path = toFile(null, dotCmd = dotCmd)
+    Util.sh(arrayOf(viewerCmd, "file://$path"))
 }
 
-fun JcBlockGraph.toFile(dotCmd: String, file: File? = null): Path {
+fun JcBlockGraph.toFile(
+    file: File? = null,
+    dotCmd: String = DEFAULT_DOT_CMD,
+): Path {
     Graph.setDefaultCmd(dotCmd)
 
     val graph = Graph("jcGraph")
 
     val nodes = mutableMapOf<JcBasicBlock, Node>()
     for ((index, block) in instructions.withIndex()) {
+        val label = instructions(block)
+            .joinToString("") { "$it\\l" }
+            .replace("\"", "\\\"")
+            .replace("\n", "\\n")
         val node = Node("$index")
             .setShape(Shape.box)
-            .setLabel(instructions(block).joinToString("") { "$it\\l" }.replace("\"", "\\\"").replace("\n", "\\n"))
+            .setLabel(label)
             .setFontSize(12.0)
         nodes[block] = node
         graph.addNode(node)

jacodb-core/src/test/kotlin/org/jacodb/testing/cfg/IRSvgGenerator.kt

@@ -56,8 +56,8 @@ class IRSvgGenerator(private val folder: File) : Closeable {
             val fileName = "${it.enclosingClass.simpleName}-$fixedName-$index.svg"
             val graph = it.flowGraph()
             JcGraphChecker(it, graph).check()
-            graph.toFile("dot", false, file = File(folder, "graph-$fileName"))
-            graph.blockGraph().toFile("dot", file = File(folder, "block-graph-$fileName"))
+            graph.toFile(File(folder, "graph-$fileName"))
+            graph.blockGraph().toFile(File(folder, "block-graph-$fileName"))
         }
     }
 

jacodb-ets/build.gradle.kts

@@ -2,6 +2,7 @@ import java.io.FileNotFoundException
 
 plugins {
     kotlin("plugin.serialization")
+    `java-test-fixtures`
 }
 
 dependencies {
@@ -15,6 +16,9 @@ dependencies {
 
     testImplementation(kotlin("test"))
     testImplementation(Libs.mockk)
+
+    testFixturesImplementation(Libs.kotlin_logging)
+    testFixturesImplementation(Libs.junit_jupiter_api)
 }
 
 // Example usage:
@@ -67,6 +71,7 @@ tasks.register("generateTestResources") {
             "--multi",
             inputDir.relativeTo(resources).path,
             outputDir.relativeTo(resources).path,
+            "-t",
         )
         println("Running: '${cmd.joinToString(" ")}'")
         val process = ProcessBuilder(cmd).directory(resources).start()

jacodb-ets/src/main/kotlin/org/jacodb/ets/base/Constants.kt

@@ -0,0 +1,37 @@
+/*
+ *  Copyright 2022 UnitTestBot contributors (utbot.org)
+ * <p>
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * <p>
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.jacodb.ets.base
+
+const val CONSTRUCTOR_NAME = "constructor"
+
+const val DEFAULT_ARK_CLASS_NAME = "%dflt"
+const val DEFAULT_ARK_METHOD_NAME = "%dflt"
+
+const val UNKNOWN_PROJECT_NAME = "%unk"
+const val UNKNOWN_FILE_NAME = "%unk"
+const val UNKNOWN_NAMESPACE_NAME = "%unk"
+const val UNKNOWN_CLASS_NAME = "" // TODO: consult AA/src/core/common/Const.ts
+const val UNKNOWN_FIELD_NAME = "" // TODO: consult AA/src/core/common/Const.ts
+const val UNKNOWN_METHOD_NAME = "" // TODO: consult AA/src/core/common/Const.ts
+
+const val INSTANCE_INIT_METHOD_NAME = "%instInit"
+const val STATIC_INIT_METHOD_NAME = "%statInit"
+
+const val ANONYMOUS_CLASS_PREFIX = "%AC"
+const val ANONYMOUS_METHOD_PREFIX = "%AM"
+
+const val TEMP_LOCAL_PREFIX = "%"

jacodb-ets/src/main/kotlin/org/jacodb/ets/base/EtsExpr.kt

@@ -77,6 +77,7 @@
         // Call
         fun visit(expr: EtsInstanceCallExpr): R
         fun visit(expr: EtsStaticCallExpr): R
+        fun visit(expr: EtsPtrCallExpr): R
 
         // Other
         fun visit(expr: EtsCommaExpr): R
@@ -133,6 +134,7 @@
 
             override fun visit(expr: EtsInstanceCallExpr): R = defaultVisit(expr)
             override fun visit(expr: EtsStaticCallExpr): R = defaultVisit(expr)
+            override fun visit(expr: EtsPtrCallExpr): R = defaultVisit(expr)
 
             override fun visit(expr: EtsCommaExpr): R = defaultVisit(expr)
             override fun visit(expr: EtsTernaryExpr): R = defaultVisit(expr)
@@ -790,6 +792,20 @@
     }
 }
 
+data class EtsPtrCallExpr(
+    val ptr: EtsLocal,
+    override val method: EtsMethodSignature,
+    override val args: List<EtsValue>,
+) : EtsCallExpr {
+    override fun toString(): String {
+        return "${ptr}.${method.name}(${args.joinToString()})"
+    }
+
+    override fun <R> accept(visitor: EtsExpr.Visitor<R>): R {
+        return visitor.visit(this)
+    }
+}
+
 data class EtsCommaExpr(
     override val left: EtsEntity,
     override val right: EtsEntity,

jacodb-ets/src/main/kotlin/org/jacodb/ets/base/EtsType.kt

@@ -19,7 +19,9 @@
 import org.jacodb.api.common.CommonType
 import org.jacodb.api.common.CommonTypeName
 import org.jacodb.ets.model.EtsClassSignature
+import org.jacodb.ets.model.EtsLocalSignature
 import org.jacodb.ets.model.EtsMethodSignature
+import org.jacodb.ets.model.EtsNamespaceSignature
 
 interface EtsType : CommonType, CommonTypeName {
     override val typeName: String
@@ -45,6 +47,10 @@
         fun visit(type: EtsArrayType): R
         fun visit(type: EtsArrayObjectType): R
         fun visit(type: EtsUnclearRefType): R
+        fun visit(type: EtsGenericType): R
+        fun visit(type: EtsAliasType): R
+        fun visit(type: EtsAnnotationNamespaceType): R
+        fun visit(type: EtsAnnotationTypeQueryType): R
 
         interface Default<R> : Visitor<R> {
             override fun visit(type: EtsAnyType): R = defaultVisit(type)
@@ -64,6 +70,10 @@
             override fun visit(type: EtsArrayType): R = defaultVisit(type)
             override fun visit(type: EtsArrayObjectType): R = defaultVisit(type)
             override fun visit(type: EtsUnclearRefType): R = defaultVisit(type)
+            override fun visit(type: EtsGenericType): R = defaultVisit(type)
+            override fun visit(type: EtsAliasType): R = defaultVisit(type)
+            override fun visit(type: EtsAnnotationNamespaceType): R = defaultVisit(type)
+            override fun visit(type: EtsAnnotationTypeQueryType): R = defaultVisit(type)
 
             fun defaultVisit(type: EtsType): R
         }
@@ -215,10 +225,16 @@
 interface EtsRefType : EtsType
 
 data class EtsClassType(
-    val classSignature: EtsClassSignature,
+    val signature: EtsClassSignature,
+    val typeParameters: List<EtsType> = emptyList(),
 ) : EtsRefType {
     override val typeName: String
-        get() = classSignature.name
+        get() = if (typeParameters.isNotEmpty()) {
+            val generics = typeParameters.joinToString()
+            "${signature.name}<$generics>"
+        } else {
+            signature.name
+        }
 
     override fun toString(): String = typeName
 
@@ -229,9 +245,15 @@
 
 data class EtsFunctionType(
     val method: EtsMethodSignature,
+    val typeParameters: List<EtsType> = emptyList(),
 ) : EtsRefType {
     override val typeName: String
-        get() = method.name
+        get() = if (typeParameters.isNotEmpty()) {
+            val generics = typeParameters.joinToString()
+            "${method.name}<$generics>"
+        } else {
+            method.name
+        }
 
     override fun toString(): String = typeName
 
@@ -268,11 +290,85 @@
 }
 
 data class EtsUnclearRefType(
-    override val typeName: String,
+    val name: String,
+    val typeParameters: List<EtsType> = emptyList(),
 ) : EtsRefType {
+    override val typeName: String
+        get() = if (typeParameters.isNotEmpty()) {
+            val generics = typeParameters.joinToString()
+            "$name<$generics>"
+        } else {
+            name
+        }
+
     override fun toString(): String = typeName
 
     override fun <R> accept(visitor: EtsType.Visitor<R>): R {
         return visitor.visit(this)
     }
 }
+
+data class EtsGenericType(
+    val name: String,
+    val defaultType: EtsType? = null,
+    val constraint: EtsType? = null,
+) : EtsRefType {
+    override val typeName: String
+        get() = name
+
+    override fun toString(): String {
+        return name + (constraint?.let { " extends $it" } ?: "") + (defaultType?.let { " = $it" } ?: "")
+    }
+
+    override fun <R> accept(visitor: EtsType.Visitor<R>): R {
+        return visitor.visit(this)
+    }
+}
+
+data class EtsAliasType(
+    val name: String,
+    val originalType: EtsType,
+    val signature: EtsLocalSignature,
+) : EtsType {
+    override val typeName: String
+        get() = name
+
+    override fun toString(): String {
+        return "$name = $originalType"
+    }
+
+    override fun <R> accept(visitor: EtsType.Visitor<R>): R {
+        return visitor.visit(this)
+    }
+}
+
+data class EtsAnnotationNamespaceType(
+    val originType: String,
+    val namespaceSignature: EtsNamespaceSignature,
+) : EtsType {
+    override val typeName: String
+        get() = originType
+
+    override fun toString(): String {
+        return originType
+    }
+
+    override fun <R> accept(visitor: EtsType.Visitor<R>): R {
+        return visitor.visit(this)
+    }
+}
+
+data class EtsAnnotationTypeQueryType(
+    val originType: String,
+) : EtsType {
+    override val typeName: String
+        get() = originType
+
+    override fun toString(): String {
+        return originType
+    }
+
+    override fun <R> accept(visitor: EtsType.Visitor<R>): R {
+        return visitor.visit(this)
+    }
+}