github
diff --git a/‎change_notes/2023-04-28-dcl56-cpp-perf.md
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎change_notes/2023-04-28-dcl56-cpp-perf.md
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎cpp/common/src/codingstandards/cpp/StaticInitialization.qll
Copy file name to clipboardExpand all lines: cpp/common/src/codingstandards/cpp/StaticInitialization.qll
+15-8Lines changed: 15 additions & 8 deletions b/‎cpp/common/src/codingstandards/cpp/StaticInitialization.qll
Copy file name to clipboardExpand all lines: cpp/common/src/codingstandards/cpp/StaticInitialization.qll
+15-8Lines changed: 15 additions & 8 deletions
@@ -0,0 +1 @@
+ * `DCL56-CPP` - performance has been improved for databases with complex initializers.
@@ -27,6 +27,15 @@ module StaticInitializationGraph {
    *  - Create a `Node` instance for each injector type.
    */
 
+  /**
+   * Gets an Expr directly or indirectly included in an initializer.
+   */
+  private Expr getAnInitializerExpr(Initializer i) {
+    result = i.getExpr()
+    or
+    result = getAnInitializerExpr(i).getAChild()
+  }
+
   newtype TNode =
     TInitializerNode(Initializer i) {
       // This is the initializer of a static storage duration variable
@@ -48,29 +57,29 @@ module StaticInitializationGraph {
     } or
     TFunctionCallNode(FunctionCall fc) {
       // This is a function call that occurs in an initializer called during static initialization
-      exists(TInitializerNode(any(Initializer i | i.getExpr().getAChild*() = fc)))
+      exists(TInitializerNode(any(Initializer i | getAnInitializerExpr(i) = fc)))
       or
       // This is a function call that occurs in a function called during static initialization
       exists(
         TFunctionNode(any(Function f |
             f = fc.getEnclosingFunction() and
             // Not in an initializer of a local variable, where the desired flow is instead:
             // function -> initializer -> fc
-            not exists(Initializer i | i.getExpr().getAChild*() = fc)
+            not exists(Initializer i | getAnInitializerExpr(i) = fc)
           ))
       )
     } or
     TVariableAccessNode(VariableAccess va) {
       // This is a variable that is accessed in an initializer called during static initialization
-      exists(TInitializerNode(any(Initializer i | i.getExpr().getAChild*() = va)))
+      exists(TInitializerNode(any(Initializer i | getAnInitializerExpr(i) = va)))
       or
       // This is a variable that is accessed in a function called during static initialization
       exists(
         TFunctionNode(any(Function f |
             f = va.getEnclosingFunction() and
             // Not in an initializer of a local variable, where the desired flow is instead:
             // function -> initializer -> va
-            not exists(Initializer i | i.getExpr().getAChild*() = va)
+            not exists(Initializer i | getAnInitializerExpr(i) = va)
           ))
       )
     }
@@ -149,9 +158,7 @@ module StaticInitializationGraph {
     or
     // Initializer steps
     exists(Initializer i | i = n1.(InitializerNode).getInitializer() |
-      i.getExpr().getAChild*() = n2.(FunctionCallNode).getFunctionCall()
-      or
-      i.getExpr().getAChild*() = n2.(VariableAccessNode).getVariableAccess()
+      getAnInitializerExpr(i) = n2.getExpr()
     )
     or
     // FunctionCall steps
@@ -169,7 +176,7 @@ module StaticInitializationGraph {
       f = n2.getExpr().getEnclosingFunction() and
       // But not in an initializer of a local variable, where the desired flow is instead:
       // function -> initializer -> expression
-      not exists(Initializer i | i.getExpr().getAChild*() = n2.getExpr())
+      not exists(Initializer i | getAnInitializerExpr(i) = n2.getExpr())
       or
       // `n2` is an initializer of a local scope variable within function `f`
       n2.(InitializerNode).getInitializer().getDeclaration().(LocalScopeVariable).getFunction() = f
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+ * `DCL56-CPP` - performance has been improved for databases with complex initializers.