C++: Remove the type restriction on 'GuardConditionFromNotExpr' since this class also applies to C++.

MathiasVP · MathiasVP · commit d0bd6eb2eb73 · 2025-01-16T16:55:10.000Z
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll
@@ -268,7 +268,6 @@ private class GuardConditionFromNotExpr extends GuardConditionImpl {
     exists(NotExpr notExpr, Type t |
       this = notExpr.getOperand() and
       t = this.getUnspecifiedType() and
-      not t instanceof BoolType and
       ir.getUnconvertedResultExpression() = notExpr
     )
   }
diff --git a/cpp/ql/test/library-tests/controlflow/guards/GuardsCompare.expected b/cpp/ql/test/library-tests/controlflow/guards/GuardsCompare.expected
@@ -262,9 +262,13 @@
 | 122 | b == 0 when b is false |
 | 122 | b == 1 when b is true |
 | 125 | ! ... != 0 when ! ... is true |
+| 125 | ! ... != 0 when call to safe is false |
 | 125 | ! ... != 1 when ! ... is false |
+| 125 | ! ... != 1 when call to safe is true |
 | 125 | ! ... == 0 when ! ... is false |
+| 125 | ! ... == 0 when call to safe is true |
 | 125 | ! ... == 1 when ! ... is true |
+| 125 | ! ... == 1 when call to safe is false |
 | 125 | call to safe != 0 when ! ... is false |
 | 125 | call to safe != 0 when call to safe is true |
 | 125 | call to safe != 1 when ! ... is true |
diff --git a/cpp/ql/test/library-tests/controlflow/guards/GuardsEnsure.expected b/cpp/ql/test/library-tests/controlflow/guards/GuardsEnsure.expected
@@ -540,6 +540,8 @@ unary
 | test.cpp:125:13:125:20 | ! ... | test.cpp:125:13:125:20 | ! ... | == | 1 | 125 | 125 |
 | test.cpp:125:13:125:20 | ! ... | test.cpp:125:14:125:17 | call to safe | != | 1 | 125 | 125 |
 | test.cpp:125:13:125:20 | ! ... | test.cpp:125:14:125:17 | call to safe | == | 0 | 125 | 125 |
+| test.cpp:125:14:125:17 | call to safe | test.cpp:125:13:125:20 | ! ... | != | 0 | 125 | 125 |
+| test.cpp:125:14:125:17 | call to safe | test.cpp:125:13:125:20 | ! ... | == | 1 | 125 | 125 |
 | test.cpp:125:14:125:17 | call to safe | test.cpp:125:14:125:17 | call to safe | != | 1 | 125 | 125 |
 | test.cpp:125:14:125:17 | call to safe | test.cpp:125:14:125:17 | call to safe | == | 0 | 125 | 125 |
 | test.cpp:131:6:131:21 | call to __builtin_expect | test.cpp:131:6:131:21 | call to __builtin_expect | != | 0 | 131 | 132 |

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,6 @@ private class GuardConditionFromNotExpr extends GuardConditionImpl {`
`268`	`268`	`exists(NotExpr notExpr, Type t \|`
`269`	`269`	`this = notExpr.getOperand() and`
`270`	`270`	`t = this.getUnspecifiedType() and`
`271`		`- not t instanceof BoolType and`
`272`	`271`	`ir.getUnconvertedResultExpression() = notExpr`
`273`	`272`	`)`
`274`	`273`	`}`