Merge pull request #271 from github/hvitved/cfg/shared

Adopt shared CFG library

Author: hvitved

Makefile

@@ -65,3 +65,7 @@ extractor:	$(FILES) $(BIN_FILES)
 	cp ql/lib/ruby.dbscheme extractor-pack/ruby.dbscheme
 	cp target/release/ruby-extractor$(EXE) extractor-pack/tools/$(CODEQL_PLATFORM)/extractor$(EXE)
 	cp target/release/ruby-autobuilder$(EXE) extractor-pack/tools/$(CODEQL_PLATFORM)/autobuilder$(EXE)
+
+test: extractor dbscheme
+	codeql pack install ql/test
+	codeql test run --check-databases --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --search-path . --consistency-queries ql/consistency-queries ql/test

codeql

@@ -1 +1 @@
-import codeql.ruby.controlflow.internal.Consistency
+import codeql.ruby.controlflow.internal.ControlFlowGraphImplShared::Consistency

ql/consistency-queries/CfgConsistency.ql

@@ -62,11 +62,11 @@ class ExitNode extends CfgNode, TExitNode {
  * (dead) code or not important for control flow, and multiple when there are different
  * splits for the AST node.
  */
-class AstCfgNode extends CfgNode, TAstCfgNode {
+class AstCfgNode extends CfgNode, TElementNode {
   private Splits splits;
   private AstNode n;
 
-  AstCfgNode() { this = TAstCfgNode(n, splits) }
+  AstCfgNode() { this = TElementNode(n, splits) }
 
   final override AstNode getNode() { result = n }
 

ql/lib/codeql/ruby/controlflow/CfgNodes.qll

@@ -29,7 +29,7 @@ class CfgScope extends Scope {
  *
  * Only nodes that can be reached from an entry point are included in the CFG.
  */
-class CfgNode extends TCfgNode {
+class CfgNode extends TNode {
   /** Gets a textual representation of this control flow node. */
   string toString() { none() }