8000 C++: Revert "Merge pull request #12125 from jketema/unique-function" by MathiasVP · Pull Request #15304 · github/codeql · GitHub
[go: up one dir, main page]
Skip to content

C++: Revert "Merge pull request #12125 from jketema/unique-function" #15304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 12, 2024
Merged

C++: Revert "Merge pull request #12125 from jketema/unique-function" #15304

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84d08b0
Revert "Merge pull request #12125 from jketema/unique-function"
MathiasVP Jan 12, 2024
fe2c806
C++: Undo some of the reverting.
MathiasVP Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
C++: Undo some of the reverting.
  • Loading branch information
@MathiasVP
MathiasVP committed Jan 12, 2024
commit fe2c806c2db5f3dceaf2877f34a25fcbce34337b
6 changes: 3 additions & 3 deletions cpp/ql/lib/semmle/code/cpp/controlflow/internal/ConstantExprs.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ private predicate loopConditionAlwaysUponEntry(ControlFlowNode loop, Expr condit
* should be in this relation.
*/
pragma[noinline]
private predicate isFunction(Element el) {
el instanceof Function
private predicate isFunction(@element el) {
el instanceof @function
or
el.(Expr).getParent() = el
}
Expand All @@ -122,7 +122,7 @@ private predicate isFunction(Element el) {
*/
pragma[noopt]
private predicate callHasNoTarget(@funbindexpr fc) {
exists(Function f |
exists(@function f |
funbind(fc, f) and
not isFunction(f)
)
Expand Down
2 changes: 1 addition & 1 deletion cpp/ql/lib/semmle/code/cpp/internal/ResolveGlobalVariable.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ private predicate isGlobalWithMangledNameAndWithoutDefinition(@mangledname name,
* a unique global variable `complete` with the same name that does have a definition.
*/
private predicate hasTwinWithDefinition(@globalvariable incomplete, @globalvariable complete) {
not variable_instantiation(incomplete, complete) and
exists(@mangledname name |
not variable_instantiation(incomplete, complete) and
isGlobalWithMangledNameAndWithoutDefinition(name, incomplete) and
isGlobalWithMangledNameAndWithDefinition(name, complete)
)
Expand Down
0