ruby cfg: endblocks

Author: aschackmull

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

@@ -132,6 +132,7 @@ private module Ast implements AstSig<Location> {
     or
     not exists(adjustedGetChild(parent, _)) and
     not parent instanceof R::Ast::Callable and
+    not parent instanceof R::Ast::EndBlock and
     (
       synthChild(parent, index, result)
       or
@@ -151,15 +152,19 @@ private module Ast implements AstSig<Location> {
   cached
   Callable getEnclosingCallable(AstNode node) { result = parentScope*(scopeOfInclSynth(node)) }
 
-  // TODO: Include EndBlock
   class Callable extends AstNode {
-    Callable() { this instanceof R::Ast::Toplevel or this instanceof R::Ast::Callable }
+    Callable() {
+      this instanceof R::Ast::Toplevel or
+      this instanceof R::Ast::Callable or
+      this instanceof R::Ast::EndBlock
+    }
   }
 
   AstNode callableGetBody(Callable c) {
     result = c.(R::Ast::Toplevel).getABeginBlock() or
     result = c.(R::Ast::Toplevel).getAStmt() or
-    result = c.(R::Ast::Callable).getBody()
+    result = c.(R::Ast::Callable).getBody() or
+    result = c.(R::Ast::EndBlock).getAStmt()
   }
 
   class Parameter extends AstNode instanceof R::Ast::Parameter {
@@ -190,7 +195,7 @@ private module Ast implements AstSig<Location> {
   class Expr = Stmt;
 
   class BlockStmt extends Stmt instanceof R::Ast::StmtSequence {
-    BlockStmt() { not this instanceof TryStmt }
+    BlockStmt() { not this instanceof TryStmt and not this instanceof R::Ast::EndBlock }
 
     Stmt getStmt(int n) { result = desugar(super.getStmt(n)) }
 
@@ -445,6 +450,12 @@ private module Input implements InputSig1, InputSig2 {
       result = t.getBeginBlock(index) or
       result = desugar(t.getStmt(index - count(t.getABeginBlock())))
     )
+    or
+    exists(R::Ast::EndBlock e |
+      c = e and
+      exists(ctx) and
+      result = desugar(e.getStmt(index))
+    )
   }
 
   predicate catchAll(Ast::CatchClause catch) {