Merge pull request #21699 from jketema/join-fix

jketema · web-flow · commit e0ce5bcf4091 · 2026-04-13T16:03:38.000+02:00
C++: Fix `isCompiledAsC` join order
diff --git a/cpp/ql/src/Likely Bugs/Underspecified Functions/MistypedFunctionArguments.qll b/cpp/ql/src/Likely Bugs/Underspecified Functions/MistypedFunctionArguments.qll
@@ -79,9 +79,7 @@ private predicate hasZeroParamDecl(Function f) {
 
 // True if this file (or header) was compiled as a C file
 private predicate isCompiledAsC(File f) {
-  f.compiledAsC()
-  or
-  exists(File src | isCompiledAsC(src) | src.getAnIncludedFile() = f)
+  exists(File src | src.compiledAsC() | src.getAnIncludedFile*() = f)
 }
 
 predicate mistypedFunctionArguments(FunctionCall fc, Function f, Parameter p) {
diff --git a/cpp/ql/src/Likely Bugs/Underspecified Functions/TooFewArguments.qll b/cpp/ql/src/Likely Bugs/Underspecified Functions/TooFewArguments.qll
@@ -28,9 +28,7 @@ private predicate hasZeroParamDecl(Function f) {
 
 /* Holds if this file (or header) was compiled as a C file. */
 private predicate isCompiledAsC(File f) {
-  f.compiledAsC()
-  or
-  exists(File src | isCompiledAsC(src) | src.getAnIncludedFile() = f)
+  exists(File src | src.compiledAsC() | src.getAnIncludedFile*() = f)
 }
 
 /** Holds if `fc` is a call to `f` with too few arguments. */
diff --git a/cpp/ql/src/Likely Bugs/Underspecified Functions/TooManyArguments.qll b/cpp/ql/src/Likely Bugs/Underspecified Functions/TooManyArguments.qll
@@ -19,9 +19,7 @@ private predicate hasZeroParamDecl(Function f) {
 
 // True if this file (or header) was compiled as a C file
 private predicate isCompiledAsC(File f) {
-  f.compiledAsC()
-  or
-  exists(File src | isCompiledAsC(src) | src.getAnIncludedFile() = f)
+  exists(File src | src.compiledAsC() | src.getAnIncludedFile*() = f)
 }
 
 predicate tooManyArguments(FunctionCall fc, Function f) {

Original file line number	Diff line number	Diff line change
`@@ -79,9 +79,7 @@ private predicate hasZeroParamDecl(Function f) {`
`79`	`79`
`80`	`80`	`// True if this file (or header) was compiled as a C file`
`81`	`81`	`private predicate isCompiledAsC(File f) {`
`82`		`- f.compiledAsC()`
`83`		`- or`
`84`		`- exists(File src \| isCompiledAsC(src) \| src.getAnIncludedFile() = f)`
	`82`	`+ exists(File src \| src.compiledAsC() \| src.getAnIncludedFile*() = f)`
`85`	`83`	`}`
`86`	`84`
`87`	`85`	`predicate mistypedFunctionArguments(FunctionCall fc, Function f, Parameter p) {`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,7 @@ private predicate hasZeroParamDecl(Function f) {`
`28`	`28`
`29`	`29`	`/* Holds if this file (or header) was compiled as a C file. */`
`30`	`30`	`private predicate isCompiledAsC(File f) {`
`31`		`- f.compiledAsC()`
`32`		`- or`
`33`		`- exists(File src \| isCompiledAsC(src) \| src.getAnIncludedFile() = f)`
	`31`	`+ exists(File src \| src.compiledAsC() \| src.getAnIncludedFile*() = f)`
`34`	`32`	`}`
`35`	`33`
`36`	`34`	/** Holds if `fc` is a call to `f` with too few arguments. */
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,7 @@ private predicate hasZeroParamDecl(Function f) {`
`19`	`19`
`20`	`20`	`// True if this file (or header) was compiled as a C file`
`21`	`21`	`private predicate isCompiledAsC(File f) {`
`22`		`- f.compiledAsC()`
`23`		`- or`
`24`		`- exists(File src \| isCompiledAsC(src) \| src.getAnIncludedFile() = f)`
	`22`	`+ exists(File src \| src.compiledAsC() \| src.getAnIncludedFile*() = f)`
`25`	`23`	`}`
`26`	`24`
`27`	`25`	`predicate tooManyArguments(FunctionCall fc, Function f) {`