Address review comments

Author: hvitved

misc/codegen/codegen.py

@@ -54,6 +54,8 @@ def _parse_args() -> argparse.Namespace:
                             "generated qll file importing every class file"),
         p.add_argument("--ql-test-output",
                        help="output directory for QL generated extractor test files"),
+        p.add_argument("--ql-cfg-output",
+                       help="output directory for QL CFG layer (optional)."),
         p.add_argument("--cpp-output",
                        help="output directory for generated C++ files, required if trap or cpp is provided to "
                             "--generate"),
@@ -64,8 +66,6 @@ def _parse_args() -> argparse.Namespace:
                        help="registry file containing information about checked-in generated code. A .gitattributes"
                             "file is generated besides it to mark those files with linguist-generated=true. Must"
                             "be in a directory containing all generated code."),
-        p.add_argument("--ql-cfg-output",
-                       help="output directory for QL CFG layer (optional)."),
     ]
     p.add_argument("--script-name",
                    help="script name to put in header comments of generated files. By default, the path of this "

rust/ql/.generated.list

@@ -65,11 +65,12 @@ query predicate missingCfgChild(CfgNode parent, string pred, int i, AstNode chil
   CfgNodes::missingCfgChild(parent, pred, i, child) and
   successfullyExtractedFile(child.getLocation().getFile()) and
   not exists(AstNode last, CfgImpl::Completion c | CfgImpl::last(child, last, c) |
-    // In for example `if (a && true) ...` there is no RHS CFG node going into the
-    // `[false] a && true` operation
+    // In for example `if (a && true) ...`, there is no edge from the CFG node
+    // for `true` into the `[false] a && true` node.
     strictcount(ConditionalSuccessor cs | exists(last.getACfgNode().getASuccessor(cs)) | cs) = 1
     or
-    // In for example `x && return`, there is no RHS CFG node going into the `&&` operation
+    // In for example `x && return`, there is no edge from the node for
+    // `return` into the `&&` node.
     not c instanceof CfgImpl::NormalCompletion
   )
 }

rust/ql/lib/codeql/rust/controlflow/internal/CfgConsistency.qll

@@ -158,7 +158,7 @@ module Node {
 
     ParameterNode() { this = TParameterNode(n) }
 
-    /** Gets the parameter in the AST that this node corresponds to. */
+    /** Gets the parameter in the CFG that this node corresponds to. */
     ParamCfgNode getParameter() { result = n }
   }
 

rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll

@@ -1467,7 +1467,7 @@ class _:
     """
 
 
-@annotate(SelfParam)
+@annotate(SelfParam, cfg = True)
 class _:
     """
     A SelfParam. For example: