Kotlin: Refactor PrimitiveTypeInfo

Avoids mentioning the name of IdSignature.PublicSignature, which used to
be IdSignature.CommonSignature, giving us compatibility issues.

java/kotlin-extractor/src/main/kotlin/ExternalClassExtractor.kt

@@ -9,7 +9,7 @@ import java.util.ArrayList
 import java.util.HashSet
 import java.util.zip.GZIPOutputStream
 
-class ExternalClassExtractor(val logger: FileLogger, val sourceFilePath: String, val primitiveTypeMapping: Map<IdSignature.PublicSignature, PrimitiveTypeInfo>, val pluginContext: IrPluginContext) {
+class ExternalClassExtractor(val logger: FileLogger, val sourceFilePath: String, val primitiveTypeMapping: PrimitiveTypeMapping, val pluginContext: IrPluginContext) {
 
     val externalClassesDone = HashSet<IrClass>()
     val externalClassWorkList = ArrayList<IrClass>()

java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt

@@ -36,7 +36,7 @@ class KotlinExtractorExtension(
             val logger = Logger(logCounter, tw)
             logger.info("Extraction started")
             logger.flush()
-            val primitiveTypeMapping = makePrimitiveTypeMapping(logger, pluginContext)
+            val primitiveTypeMapping = PrimitiveTypeMapping(logger, pluginContext)
             // FIXME: FileUtil expects a static global logger
             // which should be provided by SLF4J's factory facility. For now we set it here.
             FileUtil.logger = logger
@@ -91,7 +91,7 @@ fun doFile(invocationTrapFile: String,
            trapDir: File,
            srcDir: File,
            file: IrFile,
-           primitiveTypeMapping: Map<IdSignature.PublicSignature, PrimitiveTypeInfo>,
+           primitiveTypeMapping: PrimitiveTypeMapping,
            pluginContext: IrPluginContext) {
     val filePath = file.path
     val logger = FileLogger(logCounter, fileTrapWriter)

java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt

@@ -17,7 +17,7 @@ open class KotlinFileExtractor(
     override val tw: FileTrapWriter,
     dependencyCollector: OdasaOutput.TrapFileManager?,
     externalClassExtractor: ExternalClassExtractor,
-    primitiveTypeMapping: Map<IdSignature.PublicSignature, PrimitiveTypeInfo>,
+    primitiveTypeMapping: PrimitiveTypeMapping,
     pluginContext: IrPluginContext
 ): KotlinUsesExtractor(logger, tw, dependencyCollector, externalClassExtractor, primitiveTypeMapping, pluginContext) {
 

java/kotlin-extractor/src/main/kotlin/KotlinSourceFileExtractor.kt

@@ -15,7 +15,7 @@ class KotlinSourceFileExtractor(
     tw: FileTrapWriter,
     val file: IrFile,
     externalClassExtractor: ExternalClassExtractor,
-    primitiveTypeMapping: Map<IdSignature.PublicSignature, PrimitiveTypeInfo>,
+    primitiveTypeMapping: PrimitiveTypeMapping,
     pluginContext: IrPluginContext
 ) :
   KotlinFileExtractor(logger, tw, null, externalClassExtractor, primitiveTypeMapping, pluginContext) {

java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt

@@ -19,7 +19,7 @@ open class KotlinUsesExtractor(
     open val tw: TrapWriter,
     val dependencyCollector: OdasaOutput.TrapFileManager?,
     val externalClassExtractor: ExternalClassExtractor,
-    val primitiveTypeMapping: Map<IdSignature.PublicSignature, PrimitiveTypeInfo>,
+    val primitiveTypeMapping: PrimitiveTypeMapping,
     val pluginContext: IrPluginContext
 ) {
     fun usePackage(pkg: String): Label<out DbPackage> {
@@ -314,7 +314,7 @@ open class KotlinUsesExtractor(
             return TypeResults(javaResult, kotlinResult)
         }
 
-        val primitiveInfo = primitiveTypeMapping[s.classifier.signature]
+        val primitiveInfo = primitiveTypeMapping.getPrimitiveInfo(s)
 
         when {
 /*

java/kotlin-extractor/src/main/kotlin/PrimitiveTypeInfo.kt

@@ -2,78 +2,83 @@ package com.github.codeql
 
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.ir.declarations.IrClass
+import org.jetbrains.kotlin.ir.types.IrSimpleType
 import org.jetbrains.kotlin.ir.types.IdSignatureValues
 import org.jetbrains.kotlin.ir.util.IdSignature
 import org.jetbrains.kotlin.name.FqName
 
-data class PrimitiveTypeInfo(
-    val primitiveName: String?,
-    val otherIsPrimitive: Boolean,
-    val javaClass: IrClass,
-    val kotlinPackageName: String, val kotlinClassName: String
-)
+class PrimitiveTypeMapping(logger: Logger, pluginContext: IrPluginContext) {
+    fun getPrimitiveInfo(s: IrSimpleType) = mapping[s.classifier.signature]
 
-private fun findClass(fqName: String, fallback: IrClass, logger: Logger, pluginContext: IrPluginContext): IrClass {
-    val symbol = pluginContext.referenceClass(FqName(fqName))
-    if(symbol == null) {
-        logger.warn("Can't find $fqName")
-        // Do the best we can
-        return fallback
-    } else {
-       return symbol.owner
-    }
-}
-
-fun makePrimitiveTypeMapping(logger: Logger, pluginContext: IrPluginContext): Map<IdSignature.PublicSignature, PrimitiveTypeInfo> {
-    val kotlinByte = pluginContext.irBuiltIns.byteClass.owner
-    val javaLangByte = findClass("java.lang.Byte", kotlinByte, logger, pluginContext)
-    val kotlinShort = pluginContext.irBuiltIns.shortClass.owner
-    val javaLangShort = findClass("java.lang.Short", kotlinShort, logger, pluginContext)
-    val kotlinInt = pluginContext.irBuiltIns.intClass.owner
-    val javaLangInteger = findClass("java.lang.Integer", kotlinInt, logger, pluginContext)
-    val kotlinLong = pluginContext.irBuiltIns.longClass.owner
-    val javaLangLong = findClass("java.lang.Long", kotlinLong, logger, pluginContext)
-
-    val kotlinUByte = findClass("kotlin.UByte", kotlinByte, logger, pluginContext)
-    val kotlinUShort = findClass("kotlin.UShort", kotlinShort, logger, pluginContext)
-    val kotlinUInt = findClass("kotlin.UInt", kotlinInt, logger, pluginContext)
-    val kotlinULong = findClass("kotlin.ULong", kotlinLong, logger, pluginContext)
-
-    val kotlinDouble = pluginContext.irBuiltIns.doubleClass.owner
-    val javaLangDouble = findClass("java.lang.Double", kotlinDouble, logger, pluginContext)
-    val kotlinFloat = pluginContext.irBuiltIns.floatClass.owner
-    val javaLangFloat = findClass("java.lang.Float", kotlinFloat, logger, pluginContext)
-
-    val kotlinBoolean = pluginContext.irBuiltIns.booleanClass.owner
-    val javaLangBoolean = findClass("java.lang.Boolean", kotlinBoolean, logger, pluginContext)
-
-    val kotlinChar = pluginContext.irBuiltIns.charClass.owner
-    val javaLangCharacter = findClass("java.lang.Character", kotlinChar, logger, pluginContext)
-
-    val kotlinUnit = pluginContext.irBuiltIns.unitClass.owner
-
-    val kotlinNothing = pluginContext.irBuiltIns.nothingClass.owner
-    val javaLangVoid = findClass("java.lang.Void", kotlinNothing, logger, pluginContext)
-
-    return mapOf(
-        IdSignatureValues._byte to PrimitiveTypeInfo("byte", true, javaLangByte, "kotlin", "Byte"),
-        IdSignatureValues._short to PrimitiveTypeInfo("short", true, javaLangShort, "kotlin", "Short"),
-        IdSignatureValues._int to PrimitiveTypeInfo("int", true, javaLangInteger, "kotlin", "Int"),
-        IdSignatureValues._long to PrimitiveTypeInfo("long", true, javaLangLong, "kotlin", "Long"),
-
-        IdSignatureValues.uByte to PrimitiveTypeInfo("byte", true, kotlinUByte, "kotlin", "UByte"),
-        IdSignatureValues.uShort to PrimitiveTypeInfo("short", true, kotlinUShort, "kotlin", "UShort"),
-        IdSignatureValues.uInt to PrimitiveTypeInfo("int", true, kotlinUInt, "kotlin", "UInt"),
-        IdSignatureValues.uLong to PrimitiveTypeInfo("long", true, kotlinULong, "kotlin", "ULong"),
-
-        IdSignatureValues._double to PrimitiveTypeInfo("double", true, javaLangDouble, "kotlin", "Double"),
-        IdSignatureValues._float to PrimitiveTypeInfo("float", true, javaLangFloat, "kotlin", "Float"),
-
-        IdSignatureValues._boolean to PrimitiveTypeInfo("boolean", true, javaLangBoolean, "kotlin", "Boolean"),
-
-        IdSignatureValues._char to PrimitiveTypeInfo("char", true, javaLangCharacter, "kotlin", "Char"),
-
-        IdSignatureValues.unit to PrimitiveTypeInfo("void", false, kotlinUnit, "kotlin", "Unit"),
-        IdSignatureValues.nothing to PrimitiveTypeInfo(null, true, javaLangVoid, "kotlin", "Nothing"),
+    data class PrimitiveTypeInfo(
+        val primitiveName: String?,
+        val otherIsPrimitive: Boolean,
+        val javaClass: IrClass,
+        val kotlinPackageName: String, val kotlinClassName: String
     )
+
+    private fun findClass(fqName: String, fallback: IrClass, logger: Logger, pluginContext: IrPluginContext): IrClass {
+        val symbol = pluginContext.referenceClass(FqName(fqName))
+        if(symbol == null) {
+            logger.warn("Can't find $fqName")
+            // Do the best we can
+            return fallback
+        } else {
+           return symbol.owner
+        }
+    }
+
+    private val mapping = {
+        val kotlinByte = pluginContext.irBuiltIns.byteClass.owner
+        val javaLangByte = findClass("java.lang.Byte", kotlinByte, logger, pluginContext)
+        val kotlinShort = pluginContext.irBuiltIns.shortClass.owner
+        val javaLangShort = findClass("java.lang.Short", kotlinShort, logger, pluginContext)
+        val kotlinInt = pluginContext.irBuiltIns.intClass.owner
+        val javaLangInteger = findClass("java.lang.Integer", kotlinInt, logger, pluginContext)
+        val kotlinLong = pluginContext.irBuiltIns.longClass.owner
+        val javaLangLong = findClass("java.lang.Long", kotlinLong, logger, pluginContext)
+
+        val kotlinUByte = findClass("kotlin.UByte", kotlinByte, logger, pluginContext)
+        val kotlinUShort = findClass("kotlin.UShort", kotlinShort, logger, pluginContext)
+        val kotlinUInt = findClass("kotlin.UInt", kotlinInt, logger, pluginContext)
+        val kotlinULong = findClass("kotlin.ULong", kotlinLong, logger, pluginContext)
+
+        val kotlinDouble = pluginContext.irBuiltIns.doubleClass.owner
+        val javaLangDouble = findClass("java.lang.Double", kotlinDouble, logger, pluginContext)
+        val kotlinFloat = pluginContext.irBuiltIns.floatClass.owner
+        val javaLangFloat = findClass("java.lang.Float", kotlinFloat, logger, pluginContext)
+
+        val kotlinBoolean = pluginContext.irBuiltIns.booleanClass.owner
+        val javaLangBoolean = findClass("java.lang.Boolean", kotlinBoolean, logger, pluginContext)
+
+        val kotlinChar = pluginContext.irBuiltIns.charClass.owner
+        val javaLangCharacter = findClass("java.lang.Character", kotlinChar, logger, pluginContext)
+
+        val kotlinUnit = pluginContext.irBuiltIns.unitClass.owner
+
+        val kotlinNothing = pluginContext.irBuiltIns.nothingClass.owner
+        val javaLangVoid = findClass("java.lang.Void", kotlinNothing, logger, pluginContext)
+
+        mapOf(
+            IdSignatureValues._byte to PrimitiveTypeInfo("byte", true, javaLangByte, "kotlin", "Byte"),
+            IdSignatureValues._short to PrimitiveTypeInfo("short", true, javaLangShort, "kotlin", "Short"),
+            IdSignatureValues._int to PrimitiveTypeInfo("int", true, javaLangInteger, "kotlin", "Int"),
+            IdSignatureValues._long to PrimitiveTypeInfo("long", true, javaLangLong, "kotlin", "Long"),
+
+            IdSignatureValues.uByte to PrimitiveTypeInfo("byte", true, kotlinUByte, "kotlin", "UByte"),
+            IdSignatureValues.uShort to PrimitiveTypeInfo("short", true, kotlinUShort, "kotlin", "UShort"),
+            IdSignatureValues.uInt to PrimitiveTypeInfo("int", true, kotlinUInt, "kotlin", "UInt"),
+            IdSignatureValues.uLong to PrimitiveTypeInfo("long", true, kotlinULong, "kotlin", "ULong"),
+
+            IdSignatureValues._double to PrimitiveTypeInfo("double", true, javaLangDouble, "kotlin", "Double"),
+            IdSignatureValues._float to PrimitiveTypeInfo("float", true, javaLangFloat, "kotlin", "Float"),
+
+            IdSignatureValues._boolean to PrimitiveTypeInfo("boolean", true, javaLangBoolean, "kotlin", "Boolean"),
+
+            IdSignatureValues._char to PrimitiveTypeInfo("char", true, javaLangCharacter, "kotlin", "Char"),
+
+            IdSignatureValues.unit to PrimitiveTypeInfo("void", false, kotlinUnit, "kotlin", "Unit"),
+            IdSignatureValues.nothing to PrimitiveTypeInfo(null, true, javaLangVoid, "kotlin", "Nothing"),
+        )
+    }()
 }