hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

C/C++ overlay: Address review comments

Browse Source
This commit is contained in:
idrissrio
2025-11-28 14:16:10 +01:00
parent eac06ddd8f
commit 4ad25e4d92
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
cpp/ql/lib/semmle/code/cpp/internal/Overlay.qll
View File

@@ -37,28 +37,24 @@ private string getMultiLocationFilePath(@element e) {
//TODO: add other kinds of elements with multiple locations //TODO: add other kinds of elements with multiple locations
} }
/** Holds if `e` exists in the base variant. */ /**
* A local helper predicate that holds in the base variant and never in the
* overlay variant.
*/
overlay[local] overlay[local]
private predicate existsInBase(@element e) { private predicate holdsInBase() { not isOverlay() }
not isOverlay() and
(exists(getSingleLocationFilePath(e)) or exists(getMultiLocationFilePath(e)))
}
/** /**
* Discard an element with a single location if it is in a changed file. * Discards an element from the base variant if:
* - It has a single location in a changed file, or
* - All of its locations are in changed files.
*/ */
overlay[discard_entity] overlay[discard_entity]
private predicate discardSingleLocationElement(@element e) { private predicate discardElement(@element e) {
existsInBase(e) and holdsInBase() and
overlayChangedFiles(getSingleLocationFilePath(e)) (
} overlayChangedFiles(getSingleLocationFilePath(e))
or
/** forex(string path | path = getMultiLocationFilePath(e) | overlayChangedFiles(path))
* Discard an element with multiple locations only if all its locations are in changed files. )
*/
overlay[discard_entity]
private predicate discardMultiLocationElement(@element e) {
existsInBase(e) and
exists(getMultiLocationFilePath(e)) and
forall(string path | path = getMultiLocationFilePath(e) | overlayChangedFiles(path))
} }