Java: really return a unique location for non-source entities

smowton · web-flow · commit 3fa1f17b83a2 · 2022-09-16T18:23:31.000+01:00
This was always supposed to pick one of several candidate non-source locations (usually for a generic type instantiation), but since `getFile().toString()` just produces the basename of the class file actually the results would almost always tie and all of the candidate locations would be returned. Use the full class file path as a tiebreaker instead.
diff --git a/java/ql/lib/semmle/code/Location.qll b/java/ql/lib/semmle/code/Location.qll
@@ -216,7 +216,7 @@ private predicate fixedHasLocation(Top l, Location loc, File f) {
     min(Location candidateLoc |
       hasLocation(l, candidateLoc)
     |
-      candidateLoc order by candidateLoc.getFile().toString()
+      candidateLoc order by candidateLoc.getFile().getAbsolutePath()
     ) and
   not hasSourceLocation(l, _, _) and
   locations_default(loc, f, _, _, _, _)

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ private predicate fixedHasLocation(Top l, Location loc, File f) {`
`216`	`216`	`min(Location candidateLoc \|`
`217`	`217`	`hasLocation(l, candidateLoc)`
`218`	`218`	`\|`
`219`		`- candidateLoc order by candidateLoc.getFile().toString()`
	`219`	`+ candidateLoc order by candidateLoc.getFile().getAbsolutePath()`
`220`	`220`	`) and`
`221`	`221`	`not hasSourceLocation(l, _, _) and`
`222`	`222`	`locations_default(loc, f, _, _, _, _)`