Fix trap file output paths

smowton · igfoo · commit 4c3b9e658b1b · 2022-05-10T19:50:57.000+01:00
These should be named for the class name, not its fs location
diff --git a/java/kotlin-extractor/src/main/java/com/semmle/extractor/java/OdasaOutput.java b/java/kotlin-extractor/src/main/java/com/semmle/extractor/java/OdasaOutput.java
@@ -11,7 +11,7 @@
 
 import com.github.codeql.Logger;
 import com.github.codeql.Severity;
-import static com.github.codeql.ClassNamesKt.getIrClassBinaryPath;
+import static com.github.codeql.ClassNamesKt.getIrClassBinaryName;
 import static com.github.codeql.ClassNamesKt.getIrClassVirtualFile;
 
 import org.jetbrains.kotlin.ir.declarations.IrClass;
@@ -212,7 +212,7 @@ private File trapFileForClass(IrClass sym) {
 	private final Map<String, String> memberTrapPaths = new LinkedHashMap<String, String>();
 	private static final Pattern dots = Pattern.compile(".", Pattern.LITERAL);
 	private String trapFilePathForClass(IrClass sym) {
-		String classId = getIrClassBinaryPath(sym);
+		String classId = getIrClassBinaryName(sym);
 		// TODO: Reinstate this?
 		//if (getTrackClassOrigins())
 		//  classId += "-" + StringDigestor.digest(sym.getSourceFileId());
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/ClassNames.kt b/java/kotlin-extractor/src/main/kotlin/utils/ClassNames.kt
@@ -13,7 +13,7 @@ import com.intellij.openapi.vfs.VirtualFile
 
 // Taken from Kotlin's interpreter/Utils.kt function 'internalName'
 // Translates class names into their JLS section 13.1 binary name
-fun getClassBinaryName(that: IrClass): String {
+fun getIrClassBinaryName(that: IrClass): String {
   val internalName = StringBuilder(that.name.asString())
   generateSequence(that as? IrDeclarationParent) { (it as? IrDeclaration)?.parent }
       .drop(1)
@@ -53,5 +53,5 @@ fun getIrClassBinaryPath(irClass: IrClass): String {
   // If a class location is known, replace the JAR delimiter !/:
   return getRawIrClassBinaryPath(irClass)?.replaceFirst("!/", "/")
   // Otherwise, make up a fake location:
-    ?: "/!unknown-binary-location/${getClassBinaryName(irClass).replace(".", "/")}.class"
+    ?: "/!unknown-binary-location/${getIrClassBinaryName(irClass).replace(".", "/")}.class"
 }
