Merge pull request #9678 from jketema/ql-fixes

C++: Two small QL fixes
This commit is contained in:
Mathias Vorreiter Pedersen
2022-06-23 08:23:54 +01:00
committed by GitHub
2 changed files with 8 additions and 14 deletions

View File

@@ -4,11 +4,7 @@
* qualified. * qualified.
* *
* This file contains classes that mirror the standard AST classes for C++, but * This file contains classes that mirror the standard AST classes for C++, but
* these classes are only concerned with naming. The other difference is that * these classes are only concerned with naming.
* these classes don't use the `ResolveClass.qll` mechanisms like
* `unresolveElement` because these classes should eventually be part of the
* implementation of `ResolveClass.qll`, allowing it to match up classes when
* their qualified names and parameters match.
*/ */
private import semmle.code.cpp.Declaration as D private import semmle.code.cpp.Declaration as D

View File

@@ -115,15 +115,13 @@ private module Cached {
*/ */
cached cached
predicate isClass(@usertype t) { predicate isClass(@usertype t) {
( usertypes(t, _, 1) or
usertypes(t, _, 1) or usertypes(t, _, 2) or
usertypes(t, _, 2) or usertypes(t, _, 3) or
usertypes(t, _, 3) or usertypes(t, _, 6) or
usertypes(t, _, 6) or usertypes(t, _, 10) or
usertypes(t, _, 10) or usertypes(t, _, 11) or
usertypes(t, _, 11) or usertypes(t, _, 12)
usertypes(t, _, 12)
)
} }
cached cached