Move abbreviation to external-decl extractor; record full signature.

smowton · igfoo · commit 9fd9894f6ae8 · 2022-05-10T19:51:23.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/ExternalDeclExtractor.kt b/java/kotlin-extractor/src/main/kotlin/ExternalDeclExtractor.kt
@@ -3,6 +3,7 @@ package com.github.codeql
 import com.github.codeql.utils.isExternalDeclaration
 import com.github.codeql.utils.isExternalFileClassMember
 import com.semmle.extractor.java.OdasaOutput
+import com.semmle.util.data.StringDigestor
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.util.isFileClass
@@ -44,7 +45,12 @@ class ExternalDeclExtractor(val logger: FileLogger, val invocationTrapFile: Stri
             val nextBatch = ArrayList(externalDeclWorkList)
             externalDeclWorkList.clear()
             nextBatch.forEach { workPair ->
-                val (irDecl, signature) = workPair
+                val (irDecl, possiblyLongSignature) = workPair
+                // In order to avoid excessively long signatures which can lead to trap file names longer than the filesystem
+                // limit, we truncate and add a hash to preserve uniqueness if necessary.
+                val signature = if (possiblyLongSignature.length > 100) {
+                    possiblyLongSignature.substring(0, 92) + "#" + StringDigestor.digest(possiblyLongSignature).substring(0, 8)
+                } else { possiblyLongSignature }
                 output.getTrapLockerForDecl(irDecl, signature).useAC { locker ->
                     locker.trapFileManager.useAC { manager ->
                         val shortName = when(irDecl) {
@@ -73,6 +79,9 @@ class ExternalDeclExtractor(val logger: FileLogger, val invocationTrapFile: Stri
                                     val tw = TrapWriter(logger.loggerBase, TrapLabelManager(), trapFileBW, diagnosticTrapWriter)
                                     tw.writeComment("Generated by the CodeQL Kotlin extractor for external dependencies")
                                     tw.writeComment("Part of invocation $invocationTrapFile")
+                                    if (signature != possiblyLongSignature) {
+                                        tw.writeComment("Function signature abbreviated; full signature is: $possiblyLongSignature")
+                                    }
                                     // Now elevate to a SourceFileTrapWriter, and populate the
                                     // file information if needed:
                                     val ftw = tw.makeFileTrapWriter(binaryPath, irDecl is IrClass)
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
@@ -2,7 +2,6 @@ package com.github.codeql
 
 import com.github.codeql.utils.*
 import com.semmle.extractor.java.OdasaOutput
-import com.semmle.util.data.StringDigestor
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.common.lower.parentsWithSelf
 import org.jetbrains.kotlin.backend.jvm.codegen.isRawType
@@ -258,12 +257,7 @@ open class KotlinUsesExtractor(
             }
 
             val paramTypes = parameters.map { useType(erase(it.type)) }
-            val possiblyLongSignature = paramTypes.joinToString(separator = ",", prefix = "(", postfix = ")") { it.javaResult.signature!! }
-            // In order to avoid excessively long signatures which can lead to trap file names longer than the filesystem
-            // limit, we truncate and add a hash to preserve uniqueness if necessary.
-            val signature = if (possiblyLongSignature.length > 100) {
-                possiblyLongSignature.substring(0, 92) + "#" + StringDigestor.digest(possiblyLongSignature).substring(0, 8)
-            } else { possiblyLongSignature }
+            val signature = paramTypes.joinToString(separator = ",", prefix = "(", postfix = ")") { it.javaResult.signature!! }
             dependencyCollector?.addDependency(f, signature)
             externalClassExtractor.extractLater(f, signature)
         }
