Dynamic: Add hasPrettyName()

github · Apr 9, 2024 · 8210143 · 8210143
1 parent 8cb80d6
commit 8210143
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/shared/mad/codeql/mad/dynamic/GraphExport.qll b/shared/mad/codeql/mad/dynamic/GraphExport.qll
@@ -121,6 +121,12 @@ module GraphExport<
     exposedEdge(result, path, node)
   }
 
+  private predicate hasPrettyName(RelevantNode node) {
+    exposedName(node, _, "")
+    or
+    suggestedName(node, _)
+  }
+
   private predicate nodeMustBeNamed(RelevantNode node) {
     exposedName(node, _, "")
     or
@@ -143,8 +149,7 @@ module GraphExport<
         prefix
       )
     or
-    not exposedName(node, _, _) and
-    not suggestedName(node, _) and
+    not hasPrettyName(node) and
     result = getAPrefixTypeName(getAPredecessor(node, _))
   }
 
@@ -153,8 +158,7 @@ module GraphExport<
    */
   private predicate isSyntheticallyNamedNode(RelevantNode node, string prefix) {
     nodeMustBeNamed(node) and
-    not exposedName(node, _, "") and
-    not suggestedName(node, _) and
+    not hasPrettyName(node) and
     prefix = min(getAPrefixTypeName(node))
   }