Ensure external class extractions without a VirtualFile are lowest priority

smowton · igfoo · commit 97d44d958306 · 2022-05-10T19:51:26.000+01:00
Previously by using major version 0 to represent the no-virtual-file case these got highest priority. This meant that a class extracted relating to a .java file seen by the Kotlin compiler, which necessarily lacks a useful source-location, was highest priority. Now that should get overwritten whenever anybody sees it in the form of a .class
file, since this will have version information.

This should in particular eliminate the case where a generic class is extracted with no useful source location (based on .java source), then generic instances are extracted with a useful source location (based on a .class source), but the location isn't in the database.
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
@@ -552,7 +552,7 @@ private static TrapClassVersion fromSymbol(IrDeclaration sym, Logger log) {
 					sym.getParent() instanceof IrClass ? getIrClassVirtualFile((IrClass)sym.getParent()) :
 					null;
 			if(vf == null)
-				return new TrapClassVersion(0, 0, 0, null);
+				return new TrapClassVersion(-1, 0, 0, null);
 
 			final int[] versionStore = new int[1];
 
@@ -587,11 +587,11 @@ public void visit(int version, int access, java.lang.String name, java.lang.Stri
 			}
 			catch(IllegalAccessException e) {
 				log.warn("Failed to read class file version information", e);
-				return new TrapClassVersion(0, 0, 0, null);
+				return new TrapClassVersion(-1, 0, 0, null);
 			}
 			catch(IOException e) {
 				log.warn("Failed to read class file version information", e);
-				return new TrapClassVersion(0, 0, 0, null);
+				return new TrapClassVersion(-1, 0, 0, null);
 			}
 		}
 		private boolean isValid() {

Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,7 @@ private static TrapClassVersion fromSymbol(IrDeclaration sym, Logger log) {`
`552`	`552`	`sym.getParent() instanceof IrClass ? getIrClassVirtualFile((IrClass)sym.getParent()) :`
`553`	`553`	`null;`
`554`	`554`	`if(vf == null)`
`555`		`- return new TrapClassVersion(0, 0, 0, null);`
	`555`	`+ return new TrapClassVersion(-1, 0, 0, null);`
`556`	`556`
`557`	`557`	`final int[] versionStore = new int[1];`
`558`	`558`
`@@ -587,11 +587,11 @@ public void visit(int version, int access, java.lang.String name, java.lang.Stri`
`587`	`587`	`}`
`588`	`588`	`catch(IllegalAccessException e) {`
`589`	`589`	`log.warn("Failed to read class file version information", e);`
`590`		`- return new TrapClassVersion(0, 0, 0, null);`
	`590`	`+ return new TrapClassVersion(-1, 0, 0, null);`
`591`	`591`	`}`
`592`	`592`	`catch(IOException e) {`
`593`	`593`	`log.warn("Failed to read class file version information", e);`
`594`		`- return new TrapClassVersion(0, 0, 0, null);`
	`594`	`+ return new TrapClassVersion(-1, 0, 0, null);`
`595`	`595`	`}`
`596`	`596`	`}`
`597`	`597`	`private boolean isValid() {`