hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-27 09:45:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18588 from jketema/decl-entry

Browse Source 
C++: Fix join-order problem in `UserType::getADeclarationEntry`
This commit is contained in:
Jeroen Ketema
2025-01-24 19:38:54 +01:00
committed by GitHub
parent 41ee84b412 2e33a4287f
commit 4d2ec75ef2
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cpp/ql/lib/semmle/code/cpp/UserType.qll
View File

@@ -47,10 +47,16 @@ class UserType extends Type, Declaration, NameQualifyingElement, AccessHolder, @
else result = this.getADeclarationLocation() else result = this.getADeclarationLocation()
} }
pragma[nomagic]
private TypeDeclarationEntry getADeclarationEntryBase() {
type_decls(underlyingElement(result), unresolveElement(this), _)
}
override TypeDeclarationEntry getADeclarationEntry() { override TypeDeclarationEntry getADeclarationEntry() {
if type_decls(_, unresolveElement(this), _) pragma[only_bind_into](result) = pragma[only_bind_into](this).getADeclarationEntryBase()
then type_decls(underlyingElement(result), unresolveElement(this), _) or
else exists(Class t | this.(Class).isConstructedFrom(t) and result = t.getADeclarationEntry()) not exists(this.getADeclarationEntryBase()) and
exists(Class t | this.(Class).isConstructedFrom(t) and result = t.getADeclarationEntry())
} }
override Location getADeclarationLocation() { result = this.getADeclarationEntry().getLocation() } override Location getADeclarationLocation() { result = this.getADeclarationEntry().getLocation() }