Merge pull request #10457 from github/smowton/fix/java-really-unique-fixedHasLocation

smowton · web-flow · commit 6b9d546eaf19 · 2022-09-20T10:46:45.000+01:00
Java: really return a unique location for non-source entities
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, _, _, _, _)`