C++: Add overlay support for discarding user types

IdrissRio · IdrissRio · commit d40a12f3b705 · 2025-12-08T16:08:56.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
@@ -26,6 +26,9 @@ private string getSingleLocationFilePath(@element e) {
     or
     // @fun_decl has a direct location in the fun_decls relation
     fun_decls(e, _, _, _, loc)
+    or
+    // @type_decl has a direct location in the type_decls relation
+    type_decls(e, _, loc)
   |
     result = getLocationFilePath(loc)
   )
@@ -42,6 +45,9 @@ private string getMultiLocationFilePath(@element e) {
     or
     // @function gets its location(s) from its @fun_decl(s)
     exists(@fun_decl fd | fun_decls(fd, e, _, _, loc))
+    or
+    // @usertype gets its location(s) from its @type_decl(s)
+    exists(@type_decl td | type_decls(td, e, loc))
   |
     result = getLocationFilePath(loc)
   )

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@ private string getSingleLocationFilePath(@element e) {`
`26`	`26`	`or`
`27`	`27`	`// @fun_decl has a direct location in the fun_decls relation`
`28`	`28`	`fun_decls(e, _, _, _, loc)`
	`29`	`+ or`
	`30`	`+ // @type_decl has a direct location in the type_decls relation`
	`31`	`+ type_decls(e, _, loc)`
`29`	`32`	`\|`
`30`	`33`	`result = getLocationFilePath(loc)`
`31`	`34`	`)`
`@@ -42,6 +45,9 @@ private string getMultiLocationFilePath(@element e) {`
`42`	`45`	`or`
`43`	`46`	`// @function gets its location(s) from its @fun_decl(s)`
`44`	`47`	`exists(@fun_decl fd \| fun_decls(fd, e, _, _, loc))`
	`48`	`+ or`
	`49`	`+ // @usertype gets its location(s) from its @type_decl(s)`
	`50`	`+ exists(@type_decl td \| type_decls(td, e, loc))`
`45`	`51`	`\|`
`46`	`52`	`result = getLocationFilePath(loc)`
`47`	`53`	`)`