C++: Add overlay support for discarding namespaces

IdrissRio · IdrissRio · commit 21367f98deb2 · 2025-12-09T13:25:39.000+01:00
diff --git a/cpp/ql/lib/semmle/code/cpp/internal/Overlay.qll b/cpp/ql/lib/semmle/code/cpp/internal/Overlay.qll
@@ -29,6 +29,9 @@ private string getSingleLocationFilePath(@element e) {
     or
     // @type_decl has a direct location in the type_decls relation
     type_decls(e, _, loc)
+    or
+    // @namespace_decl has a direct location in the namespace_decls relation
+    namespace_decls(e, _, loc, _)
   |
     result = getLocationFilePath(loc)
   )
@@ -48,6 +51,9 @@ private string getMultiLocationFilePath(@element e) {
     or
     // @usertype gets its location(s) from its @type_decl(s)
     exists(@type_decl td | type_decls(td, e, loc))
+    or
+    // @namespace gets its location(s) from its @namespace_decl(s)
+    exists(@namespace_decl nd | namespace_decls(nd, e, loc, _))
   |
     result = getLocationFilePath(loc)
   )

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,9 @@ private string getSingleLocationFilePath(@element e) {`
`29`	`29`	`or`
`30`	`30`	`// @type_decl has a direct location in the type_decls relation`
`31`	`31`	`type_decls(e, _, loc)`
	`32`	`+ or`
	`33`	`+ // @namespace_decl has a direct location in the namespace_decls relation`
	`34`	`+ namespace_decls(e, _, loc, _)`
`32`	`35`	`\|`
`33`	`36`	`result = getLocationFilePath(loc)`
`34`	`37`	`)`
`@@ -48,6 +51,9 @@ private string getMultiLocationFilePath(@element e) {`
`48`	`51`	`or`
`49`	`52`	`// @usertype gets its location(s) from its @type_decl(s)`
`50`	`53`	`exists(@type_decl td \| type_decls(td, e, loc))`
	`54`	`+ or`
	`55`	`+ // @namespace gets its location(s) from its @namespace_decl(s)`
	`56`	`+ exists(@namespace_decl nd \| namespace_decls(nd, e, loc, _))`
`51`	`57`	`\|`
`52`	`58`	`result = getLocationFilePath(loc)`
`53`	`59`	`)`