Fix TypeName (#308)

Saloed · web-flow · commit 453ec7c0b357 · 2025-02-17T19:16:44.000+03:00
diff --git a/jacodb-api-jvm/src/main/kotlin/org/jacodb/api/jvm/ext/JcCommons.kt b/jacodb-api-jvm/src/main/kotlin/org/jacodb/api/jvm/ext/JcCommons.kt
@@ -64,7 +64,7 @@ fun String.jcdbName(): String {
             substring(1, length - 1).replace('/', '.')
         }
 
-        else -> this.replace('/', '.')
+        else -> error("Incorrect JVM name: $this")
     }
 }
 
diff --git a/jacodb-approximations/src/main/kotlin/org/jacodb/approximation/InstSubstitutorForApproximations.kt b/jacodb-approximations/src/main/kotlin/org/jacodb/approximation/InstSubstitutorForApproximations.kt
@@ -398,7 +398,7 @@ object InstSubstitutorForApproximations : JcRawInstVisitor<JcRawInst>, JcRawExpr
     private fun <T : JcRawExpr> T.eliminateApproximations(typeName: TypeName, constructor: (TypeName) -> T): T {
         val className = typeName.typeName.toApproximationName()
         val originalClassName = findOriginalByApproximationOrNull(className) ?: return this
-        return constructor(TypeNameImpl(originalClassName))
+        return constructor(TypeNameImpl.fromTypeName(originalClassName))
     }
 
     override fun visitJcRawLocalVar(value: JcRawLocalVar): JcRawExpr {
diff --git a/jacodb-approximations/src/main/kotlin/org/jacodb/approximation/Util.kt b/jacodb-approximations/src/main/kotlin/org/jacodb/approximation/Util.kt
@@ -33,5 +33,5 @@ fun TypeName.eliminateApproximation(): TypeName {
         return resultElemType.asArray(dim)
     }
     val originalClassName = findOriginalByApproximationOrNull(typeName.toApproximationName()) ?: return this
-    return TypeNameImpl(originalClassName)
+    return TypeNameImpl.fromTypeName(originalClassName)
 }
diff --git a/jacodb-core/src/main/kotlin/org/jacodb/impl/bytecode/JcFieldImpl.kt b/jacodb-core/src/main/kotlin/org/jacodb/impl/bytecode/JcFieldImpl.kt
@@ -40,7 +40,7 @@ class JcFieldImpl(
     override val access: Int
         get() = info.access
 
-    override val type: TypeName = TypeNameImpl(info.type)
+    override val type: TypeName = TypeNameImpl.fromTypeName(info.type)
 
     override val signature: String?
         get() = info.signature
diff --git a/jacodb-core/src/main/kotlin/org/jacodb/impl/bytecode/JcMethodImpl.kt b/jacodb-core/src/main/kotlin/org/jacodb/impl/bytecode/JcMethodImpl.kt
@@ -45,11 +45,11 @@ class JcMethodImpl(
     override val name: String get() = methodInfo.name
     override val access: Int get() = methodInfo.access
     override val signature: String? get() = methodInfo.signature
-    override val returnType: TypeName = TypeNameImpl(methodInfo.returnClass)
+    override val returnType: TypeName = TypeNameImpl.fromTypeName(methodInfo.returnClass)
 
     override val exceptions: List<TypeName>
         get() {
-            return methodInfo.exceptions.map { TypeNameImpl(it) }
+            return methodInfo.exceptions.map { TypeNameImpl.fromTypeName(it) }
         }
 
     override val declaration = JcDeclarationImpl.of(location = enclosingClass.declaration.location, this)
diff --git a/jacodb-core/src/main/kotlin/org/jacodb/impl/bytecode/JcParameterImpl.kt b/jacodb-core/src/main/kotlin/org/jacodb/impl/bytecode/JcParameterImpl.kt
@@ -46,7 +46,7 @@ class JcParameterImpl(
         get() = info.annotations.map { JcAnnotationImpl(it, method.enclosingClass.classpath) }
 
     override val type: TypeName
-        get() = TypeNameImpl(info.type)
+        get() = TypeNameImpl.fromTypeName(info.type)
 
     override fun toString(): String {
         return "$method $name"
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
diff --git a/jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/TypedMethodRefImpl.kt b/jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/TypedMethodRefImpl.kt
@@ -20,7 +20,7 @@ import org.jacodb.api.jvm.*
 import org.jacodb.api.jvm.cfg.*
 import org.jacodb.api.jvm.ext.findType
 import org.jacodb.api.jvm.ext.jvmName
-import org.jacodb.impl.cfg.util.typeName
+import org.jacodb.impl.cfg.util.typeNameFromJvmName
 import org.jacodb.impl.softLazy
 import org.jacodb.impl.weakLazy
 import org.objectweb.asm.Type
@@ -64,7 +64,7 @@ abstract class MethodSignatureRef(
 
     protected val JcType.methodNotFoundMessage: String
         get() {
-            val argumentTypes = Type.getArgumentTypes(description).map { it.descriptor.typeName() }
+            val argumentTypes = Type.getArgumentTypes(description).map { it.descriptor.typeNameFromJvmName() }
             return buildString {
                 append("Can't find method '")
                 append(typeName)
diff --git a/jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/ValueExt.kt b/jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/ValueExt.kt
@@ -48,6 +48,7 @@ import org.jacodb.api.jvm.ext.short
 import org.jacodb.impl.cfg.util.NULL
 import org.jacodb.impl.cfg.util.STRING_CLASS
 import org.jacodb.impl.cfg.util.typeName
+import org.jacodb.impl.cfg.util.typeNameFromJvmName
 
 @JvmName("rawNull")
 fun JcRawNull() = JcRawNullConstant(NULL)
@@ -108,7 +109,7 @@ fun JcRawNumber(number: Number) = when (number) {
 
 @JvmName("rawString")
 fun JcRawString(value: String) =
-    JcRawStringConstant(value, STRING_CLASS.typeName())
+    JcRawStringConstant(value, STRING_CLASS.typeNameFromJvmName())
 
 fun JcClasspath.int(value: Int): JcInt = JcInt(value, int)
 fun JcClasspath.byte(value: Byte): JcByte = JcByte(value, byte)
diff --git a/jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/util/types.kt b/jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/util/types.kt
@@ -18,22 +18,22 @@ package org.jacodb.impl.cfg.util
 
 import org.jacodb.api.jvm.PredefinedPrimitives
 import org.jacodb.api.jvm.TypeName
-import org.jacodb.api.jvm.ext.jcdbName
 import org.jacodb.api.jvm.ext.jvmName
 import org.jacodb.impl.types.TypeNameImpl
+import org.objectweb.asm.Type
 
-internal val NULL = "null".typeName()
-internal const val OBJECT_CLASS = "Ljava.lang.Object;"
-internal const val STRING_CLASS = "Ljava.lang.String;"
-internal const val THROWABLE_CLASS = "Ljava.lang.Throwable;"
-internal const val CLASS_CLASS = "Ljava.lang.Class;"
-internal const val METHOD_HANDLE_CLASS = "Ljava.lang.invoke.MethodHandle;"
-internal const val METHOD_HANDLES_CLASS = "Ljava.lang.invoke.MethodHandles;"
-internal const val METHOD_HANDLES_LOOKUP_CLASS = "Ljava.lang.invoke.MethodHandles\$Lookup;"
-internal const val METHOD_TYPE_CLASS = "Ljava.lang.invoke.MethodType;"
-internal const val LAMBDA_METAFACTORY_CLASS = "Ljava.lang.invoke.LambdaMetafactory;"
-internal val TOP = "TOP".typeName()
-internal val UNINIT_THIS = "UNINIT_THIS".typeName()
+internal val NULL = TypeNameImpl.fromTypeName("null")
+internal const val OBJECT_CLASS = "Ljava/lang/Object;"
+internal const val STRING_CLASS = "Ljava/lang/String;"
+internal const val THROWABLE_CLASS = "Ljava/lang/Throwable;"
+internal const val CLASS_CLASS = "Ljava/lang/Class;"
+internal const val METHOD_HANDLE_CLASS = "Ljava/lang/invoke/MethodHandle;"
+internal const val METHOD_HANDLES_CLASS = "Ljava/lang/invoke/MethodHandles;"
+internal const val METHOD_HANDLES_LOOKUP_CLASS = "Ljava/lang/invoke/MethodHandles\$Lookup;"
+internal const val METHOD_TYPE_CLASS = "Ljava/lang/invoke/MethodType;"
+internal const val LAMBDA_METAFACTORY_CLASS = "Ljava/lang/invoke/LambdaMetafactory;"
+internal val TOP = TypeNameImpl.fromTypeName("TOP")
+internal val UNINIT_THIS = TypeNameImpl.fromTypeName("UNINIT_THIS")
 
 internal val TypeName.jvmTypeName get() = typeName.jvmName()
 internal val TypeName.jvmClassName get() = jvmTypeName.removePrefix("L").removeSuffix(";")
@@ -59,7 +59,8 @@ val TypeName.isClass get() = !isPrimitive && !isArray
 
 internal val TypeName.isDWord get() = typeName == PredefinedPrimitives.Long || typeName == PredefinedPrimitives.Double
 
-internal fun String.typeName(): TypeName = TypeNameImpl(this.jcdbName())
+internal fun String.typeNameFromJvmName(): TypeName = TypeNameImpl.fromJvmName(this)
+internal fun String.typeName(): TypeName = TypeNameImpl.fromTypeName(this)
 fun TypeName.asArray(dimensions: Int = 1) = "$typeName${"[]".repeat(dimensions)}".typeName()
 internal fun TypeName.elementType() = elementTypeOrNull() ?: this
 
@@ -82,5 +83,8 @@ fun TypeName.baseElementType(): Pair<TypeName, Int> {
     return Pair(current!!, dim)
 }
 
-val lambdaMetaFactory: TypeName  = LAMBDA_METAFACTORY_CLASS.typeName()
+val lambdaMetaFactory: TypeName  = LAMBDA_METAFACTORY_CLASS.typeNameFromJvmName()
 val lambdaMetaFactoryMethodName: String = "metafactory"
+
+internal fun String.typeNameFromAsmInternalName(): TypeName =
+    Type.getObjectType(this).descriptor.typeNameFromJvmName()
diff --git a/jacodb-core/src/main/kotlin/org/jacodb/impl/features/classpaths/JcUnknownClass.kt b/jacodb-core/src/main/kotlin/org/jacodb/impl/features/classpaths/JcUnknownClass.kt
@@ -27,7 +27,6 @@ import org.jacodb.api.jvm.JcMethod
 import org.jacodb.api.jvm.JcTypedField
 import org.jacodb.api.jvm.JcTypedMethod
 import org.jacodb.api.jvm.TypeName
-import org.jacodb.api.jvm.ext.jcdbName
 import org.jacodb.impl.features.classpaths.AbstractJcResolvedResult.JcResolvedClassResultImpl
 import org.jacodb.impl.features.classpaths.virtual.JcVirtualClassImpl
 import org.jacodb.impl.features.classpaths.virtual.JcVirtualFieldImpl
@@ -75,8 +74,8 @@ class JcUnknownMethod(
 
         fun method(type: JcClassOrInterface, name: String, access: Int, description: String): JcMethod {
             val methodType = Type.getMethodType(description)
-            val returnType = TypeNameImpl(methodType.returnType.className.jcdbName())
-            val paramsType = methodType.argumentTypes.map { TypeNameImpl(it.className.jcdbName()) }
+            val returnType = TypeNameImpl.fromTypeName(methodType.returnType.className)
+            val paramsType = methodType.argumentTypes.map { TypeNameImpl.fromTypeName(it.className) }
             return JcUnknownMethod(type, name, access, description, returnType, paramsType)
         }
 
diff --git a/jacodb-core/src/main/kotlin/org/jacodb/impl/features/classpaths/JcUnknownType.kt b/jacodb-core/src/main/kotlin/org/jacodb/impl/features/classpaths/JcUnknownType.kt
@@ -19,7 +19,7 @@ package org.jacodb.impl.features.classpaths
 import org.jacodb.api.jvm.*
 import org.jacodb.api.jvm.ext.objectType
 import org.jacodb.impl.cfg.util.OBJECT_CLASS
-import org.jacodb.impl.types.TypeNameImpl
+import org.jacodb.impl.cfg.util.typeNameFromJvmName
 import org.objectweb.asm.Opcodes
 
 
@@ -79,7 +79,7 @@ open class JcUnknownClassLookup(val clazz: JcClassOrInterface) : JcLookup<JcFiel
 
     override fun field(name: String, typeName: TypeName?, fieldKind: JcLookup.FieldKind): JcField {
         val staticModifier = if (fieldKind == JcLookup.FieldKind.STATIC) Opcodes.ACC_STATIC else 0
-        val fieldType = typeName ?: TypeNameImpl(OBJECT_CLASS)
+        val fieldType = typeName ?: OBJECT_CLASS.typeNameFromJvmName()
         return JcUnknownField(clazz, name, access = Opcodes.ACC_PUBLIC or staticModifier, fieldType)
     }
 
@@ -99,7 +99,7 @@ open class JcUnknownTypeLookup(val type: JcClassType) : JcLookup<JcTypedField, J
 
     override fun field(name: String, typeName: TypeName?, fieldKind: JcLookup.FieldKind): JcTypedField {
         val staticModifier = if (fieldKind == JcLookup.FieldKind.STATIC) Opcodes.ACC_STATIC else 0
-        val fieldType = typeName ?: TypeNameImpl(OBJECT_CLASS)
+        val fieldType = typeName ?: OBJECT_CLASS.typeNameFromJvmName()
         return JcUnknownField.typedField(type, name, access = Opcodes.ACC_PUBLIC or staticModifier, fieldType)
     }
 
diff --git a/jacodb-core/src/main/kotlin/org/jacodb/impl/features/classpaths/virtual/VirtualClassesBuilder.kt b/jacodb-core/src/main/kotlin/org/jacodb/impl/features/classpaths/virtual/VirtualClassesBuilder.kt
@@ -70,7 +70,7 @@ open class VirtualClassesBuilder {
 
     open class VirtualFieldBuilder(private var _name: String = "_virtual_") {
         companion object {
-            private val defType = TypeNameImpl("java.lang.Object")
+            private val defType = TypeNameImpl.fromTypeName("java.lang.Object")
         }
 
         val name: String get() = _name
@@ -85,7 +85,7 @@ open class VirtualClassesBuilder {
         }
 
         fun type(name: String) = apply {
-            type = TypeNameImpl(name)
+            type = TypeNameImpl.fromTypeName(name)
         }
 
         fun name(name: String) = apply {
@@ -103,7 +103,7 @@ open class VirtualClassesBuilder {
 
         var access = Opcodes.ACC_PUBLIC
             private set
-        var returnType: TypeName = TypeNameImpl(PredefinedPrimitives.Void)
+        var returnType: TypeName = TypeNameImpl.fromTypeName(PredefinedPrimitives.Void)
             private set
         var parameters: List<TypeName> = emptyList()
             private set
@@ -113,15 +113,15 @@ open class VirtualClassesBuilder {
         }
 
         fun params(vararg p: String) = apply {
-            parameters = p.map { TypeNameImpl(it) }.toList()
+            parameters = p.map { TypeNameImpl.fromTypeName(it) }.toList()
         }
 
         fun name(name: String) = apply {
             this._name = name
         }
 
         fun returnType(name: String) = apply {
-            returnType = TypeNameImpl(name)
+            returnType = TypeNameImpl.fromTypeName(name)
         }
 
         open val description: String
diff --git a/jacodb-core/src/main/kotlin/org/jacodb/impl/fs/ByteCodeConverter.kt b/jacodb-core/src/main/kotlin/org/jacodb/impl/fs/ByteCodeConverter.kt
@@ -168,7 +168,7 @@ private fun FieldNode.asFieldInfo() = FieldInfo(
     name = name.interned,
     signature = signature,
     access = access,
-    type = Type.getObjectType(desc).className.interned,
+    type = Type.getType(desc).className.interned,
     annotations = concatLists(
         visibleAnnotations.asAnnotationInfos(true),
         invisibleAnnotations.asAnnotationInfos(false),
diff --git a/jacodb-core/src/main/kotlin/org/jacodb/impl/types/Objects.kt b/jacodb-core/src/main/kotlin/org/jacodb/impl/types/Objects.kt
@@ -19,6 +19,7 @@ package org.jacodb.impl.types
 import kotlinx.serialization.Serializable
 import org.jacodb.api.jvm.ext.jcdbName
 import org.jacodb.api.jvm.TypeName
+import org.jacodb.api.jvm.ext.jvmName
 import org.jacodb.impl.storage.AnnotationValueKind
 import org.jacodb.impl.util.adjustEmptyList
 import org.jacodb.impl.util.interned
@@ -109,8 +110,13 @@ class ClassRef(val className: String) : AnnotationValue()
 class EnumRef(val className: String, val enumName: String) : AnnotationValue()
 
 @Serializable
-data class TypeNameImpl(private val jvmName: String) : TypeName {
+data class TypeNameImpl private constructor(private val jvmName: String) : TypeName {
     override val typeName: String = jvmName.jcdbName().interned
 
     override fun toString(): String = typeName
+
+    companion object {
+        fun fromJvmName(jvmName: String): TypeNameImpl = TypeNameImpl(jvmName)
+        fun fromTypeName(typeName: String): TypeNameImpl = fromJvmName(typeName.jvmName())
+    }
 }
diff --git a/jacodb-taint-configuration/src/test/kotlin/org/jacodb/taint/configuration/ConfigurationTest.kt b/jacodb-taint-configuration/src/test/kotlin/org/jacodb/taint/configuration/ConfigurationTest.kt
@@ -54,11 +54,11 @@ open class ConfigurationTest : BaseTest() {
 
     @Test
     fun testVirtualMethod() {
-        val virtualParameter = JcVirtualParameter(0, TypeNameImpl(cp.objectType.typeName))
+        val virtualParameter = JcVirtualParameter(0, TypeNameImpl.fromTypeName(cp.objectType.typeName))
 
         val method = JcVirtualMethodImpl(
             name = "setValue",
-            returnType = TypeNameImpl(cp.objectType.typeName),
+            returnType = TypeNameImpl.fromTypeName(cp.objectType.typeName),
             parameters = listOf(virtualParameter),
             description = ""
         )

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ fun String.jcdbName(): String {`
`64`	`64`	`substring(1, length - 1).replace('/', '.')`
`65`	`65`	`}`
`66`	`66`
`67`		`- else -> this.replace('/', '.')`
	`67`	`+ else -> error("Incorrect JVM name: $this")`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ object InstSubstitutorForApproximations : JcRawInstVisitor<JcRawInst>, JcRawExpr`
`398`	`398`	`private fun <T : JcRawExpr> T.eliminateApproximations(typeName: TypeName, constructor: (TypeName) -> T): T {`
`399`	`399`	`val className = typeName.typeName.toApproximationName()`
`400`	`400`	`val originalClassName = findOriginalByApproximationOrNull(className) ?: return this`
`401`		`- return constructor(TypeNameImpl(originalClassName))`
	`401`	`+ return constructor(TypeNameImpl.fromTypeName(originalClassName))`
`402`	`402`	`}`
`403`	`403`
`404`	`404`	`override fun visitJcRawLocalVar(value: JcRawLocalVar): JcRawExpr {`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,5 @@ fun TypeName.eliminateApproximation(): TypeName {`
`33`	`33`	`return resultElemType.asArray(dim)`
`34`	`34`	`}`
`35`	`35`	`val originalClassName = findOriginalByApproximationOrNull(typeName.toApproximationName()) ?: return this`
`36`		`- return TypeNameImpl(originalClassName)`
	`36`	`+ return TypeNameImpl.fromTypeName(originalClassName)`
`37`	`37`	`}`