Ruby: Adapt to shared CFG changes

Author: hvitved

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

@@ -15,7 +15,7 @@ private import SuccessorTypes
  */
 class BasicBlock extends TBasicBlockStart {
   /** Gets the scope of this basic block. */
-  CfgScope getScope() { result = this.getAPredecessor().getScope() }
+  final CfgScope getScope() { result = this.getFirstNode().getScope() }
 
   /** Gets an immediate successor of this basic block, if any. */
   BasicBlock getASuccessor() { result = this.getASuccessor(_) }
@@ -322,8 +322,6 @@ private predicate entryBB(BasicBlock bb) { bb.getFirstNode() instanceof EntryNod
  */
 class EntryBasicBlock extends BasicBlock {
   EntryBasicBlock() { entryBB(this) }
-
-  override CfgScope getScope() { this.getFirstNode() = TEntryNode(result) }
 }
 
 /**

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

@@ -67,7 +67,7 @@ class AstCfgNode extends CfgNode, TElementNode {
   private Splits splits;
   private AstNode n;
 
-  AstCfgNode() { this = TElementNode(n, splits) }
+  AstCfgNode() { this = TElementNode(_, n, splits) }
 
   final override AstNode getNode() { result = n }
 

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

@@ -44,7 +44,7 @@ class CfgNode extends TCfgNode {
   final predicate isCondition() { exists(this.getASuccessor(any(BooleanSuccessor bs))) }
 
   /** Gets the scope of this node. */
-  final CfgScope getScope() { result = this.getBasicBlock().getScope() }
+  final CfgScope getScope() { result = getNodeCfgScope(this) }
 
   /** Gets the basic block that this control flow node belongs to. */
   BasicBlock getBasicBlock() { result.getANode() = this }