Replace getOrderDisambiguation with a module predicate

Author: asgerf

csharp/ql/test/library-tests/controlflow/graph/Common.qll

@@ -15,6 +15,8 @@ class SourceControlFlowNode extends ControlFlow::Node {
     not this.getLocation().getFile() instanceof StubFile and
     not this.getLocation().getFile().fromLibrary()
   }
+
+  string getOrderDisambiguation() { result = "" }
 }
 
 class SourceBasicBlock extends ControlFlow::BasicBlock {

java/ql/lib/semmle/code/java/ControlFlowGraph.qll

@@ -1783,11 +1783,7 @@ private module PrintGraphInput implements PrintGraph::InputSig<Location> {
 
   class Callable = J::Callable;
 
-  final private class FinalControlFlowNode = J::ControlFlowNode;
-
-  class Node extends FinalControlFlowNode {
-    string getOrderDisambiguation() { result = "" }
-  }
+  class Node = J::ControlFlowNode;
 
   predicate edge(Node node1, string s, Node node2) {
     exists(SuccessorType t |

shared/controlflow/codeql/controlflow/Cfg.qll

@@ -1315,14 +1315,12 @@ module MakeWithSplitting<
 
   private import codeql.util.PrintGraph as Pp
 
-  final private class FinalNode = Node;
+  private class NodeAlias = Node;
 
   private module PrintGraphInput implements Pp::InputSig<Location> {
     class Callable = CfgScope;
 
-    class Node extends FinalNode {
-      string getOrderDisambiguation() { result = "" }
-    }
+    class Node = NodeAlias;
 
     predicate edge(Node node1, string label, Node node2) {
       exists(SuccessorType t |

shared/dataflow/codeql/dataflow/PrintDfg.qll

@@ -21,8 +21,6 @@ module MakePrintDfg<
     class Callable = DataFlowLang::DataFlowCallable;
 
     class Node extends FinalNode {
-      string getOrderDisambiguation() { result = DataFlowLang::nodeGetOrderDisambiguation(this) }
-
       Callable getEnclosingCallable() { result = DataFlowLang::nodeGetEnclosingCallable(this) }
     }
 
@@ -41,6 +39,10 @@ module MakePrintDfg<
       or
       node1 = node2.(PostUpdateNode).getPreUpdateNode() and label = "post-update"
     }
+
+    string nodeGetOrderDisambiguation(Node node) {
+      result = DataFlowLang::nodeGetOrderDisambiguation(node)
+    }
   }
 
   import Pp::PrintGraph<Location, PrintGraphInput>

shared/util/codeql/util/PrintGraph.qll

@@ -18,12 +18,12 @@ signature module InputSig<LocationSig Location> {
     Location getLocation();
 
     string toString();
-
-    /** Gets a string to distinguish nodes that have the same location and toString value. */
-    string getOrderDisambiguation();
   }
 
   predicate edge(Node node1, string label, Node node2);
+
+  /** Gets a string to distinguish nodes that have the same location and toString value. */
+  default string nodeGetOrderDisambiguation(Node node) { result = "" }
 }
 
 /** Provides modules for printing flow graphs. */
@@ -59,7 +59,7 @@ module PrintGraph<LocationSig Location, InputSig<Location> Input> {
                 p
                 order by
                   filePath, startLine, startColumn, endLine, endColumn, p.toString(),
-                  p.getOrderDisambiguation()
+                  nodeGetOrderDisambiguation(p)
               )
           ).toString()
       }
@@ -94,7 +94,7 @@ module PrintGraph<LocationSig Location, InputSig<Location> Input> {
             edge, "\n"
             order by
               filePath, startLine, startColumn, endLine, endColumn, pred.toString(),
-              pred.getOrderDisambiguation()
+              nodeGetOrderDisambiguation(pred)
           )
       }