Fix performance RULE-6-4-2 RULE-7-0-4

change_notes/2026-04-25-fix-performance-inappropriate-bitwise-or-shift-operands.md

@@ -0,0 +1,4 @@
+- `RULE-6-4-2` - `InheritedOverridableMemberFunction.ql`:
+  - Improved evaluation performance.
+- `RULE-7-0-4` - `InappropriateBitwiseOrShiftOperands.ql`:
+  - Improved evaluation performance.

cpp/common/src/codingstandards/cpp/rules/hiddeninheritedoverridablememberfunction/HiddenInheritedOverridableMemberFunction.qll

@@ -12,15 +12,24 @@ abstract class HiddenInheritedOverridableMemberFunctionSharedQuery extends Query
 
 Query getQuery() { result instanceof HiddenInheritedOverridableMemberFunctionSharedQuery }
 
+class OverridingDeclaration extends FunctionDeclarationEntry {
+  OverridingDeclaration() { this.getDeclaration().hasDefinition() implies not this.isDefinition() }
+}
+
+class HiddenDeclaration extends OverridingDeclaration {
+  HiddenDeclaration() {
+    // Check if we are overriding a virtual inherited member function
+    this.getDeclaration().isVirtual() and
+    // Exclude private member functions, which cannot be inherited.
+    not this.getDeclaration().(MemberFunction).isPrivate()
+  }
+}
+
 query predicate problems(
-  FunctionDeclarationEntry overridingDecl, string message, FunctionDeclarationEntry hiddenDecl,
+  OverridingDeclaration overridingDecl, string message, HiddenDeclaration hiddenDecl,
   string hiddenDecl_string
 ) {
   not isExcluded(overridingDecl, getQuery()) and
-  // Check if we are overriding a virtual inherited member function
-  hiddenDecl.getDeclaration().isVirtual() and
-  // Exclude private member functions, which cannot be inherited.
-  not hiddenDecl.getDeclaration().(MemberFunction).isPrivate() and
   // The overriding declaration hides the hidden declaration if:
   (
     // 1. the overriding declaration overrides a function in a base class that is an overload of the hidden declaration
@@ -46,9 +55,6 @@ query predicate problems(
     overridingDecl.getDeclaration().getDeclaringType().getABaseClass() =
       hiddenDecl.getDeclaration().getDeclaringType()
   ) and
-  // Limit the results to the declarations and not the definitions, if any.
-  (overridingDecl.getDeclaration().hasDefinition() implies not overridingDecl.isDefinition()) and
-  (hiddenDecl.getDeclaration().hasDefinition() implies not hiddenDecl.isDefinition()) and
   message =
     "Declaration for member '" + overridingDecl.getName() +
       "' hides overridable inherited member function $@" and

cpp/misra/src/rules/RULE-7-0-4/InappropriateBitwiseOrShiftOperands.ql

@@ -22,6 +22,8 @@ predicate isConstantExpression(Expr e) {
   e.isConstant()
 }
 
+bindingset[right, leftType]
+pragma[inline_late]
 predicate isValidShiftConstantRange(Expr right, Type leftType) {
   exists(int value |
     value = right.getValue().toInt() and