CFG: add nodes for block arguments

aibaars · aibaars · commit eafec4331b3e · 2020-12-17T10:04:01.000+01:00
diff --git a/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll b/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll
@@ -313,13 +313,14 @@ module Trees {
   }
 
   private class CallTree extends StandardPostOrderTree, Call {
-    // this.getBlock() is not included as it uses a different scope
     final override AstNode getChildNode(int i) {
       result = this.getReceiver() and i = 0
       or
       result = this.getMethod() and i = 1
       or
       result = this.getArguments() and i = 2
+      or
+      result = this.getBlock() and i = 3
     }
   }
 
diff --git a/ql/test/library-tests/controlflow/graph/Cfg.expected b/ql/test/library-tests/controlflow/graph/Cfg.expected
@@ -647,6 +647,9 @@ cfg.rb:
 #-----|  -> times
 
 #   25| times
+#-----|  -> Block
+
+#   25| Block
 #-----|  -> Call
 
 #   25| x
@@ -680,6 +683,9 @@ cfg.rb:
 #-----|  -> new
 
 #   29| new
+#-----|  -> Block
+
+#   29| Block
 #-----|  -> Call
 
 #   29| BlockParameter
@@ -1985,6 +1991,9 @@ cfg.rb:
 #-----|  -> exit top-level (normal)
 
 #  189| run_block
+#-----|  -> Block
+
+#  189| Block
 #-----|  -> Call
 
 #  189| x
@@ -2627,6 +2636,9 @@ loops.rb:
 #-----|  -> Array
 
 #   25| each
+#-----|  -> DoBlock
+
+#   25| DoBlock
 #-----|  -> Call
 
 #   25| x

Original file line number	Diff line number	Diff line change
`@@ -313,13 +313,14 @@ module Trees {`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`private class CallTree extends StandardPostOrderTree, Call {`
`316`		`- // this.getBlock() is not included as it uses a different scope`
`317`	`316`	`final override AstNode getChildNode(int i) {`
`318`	`317`	`result = this.getReceiver() and i = 0`
`319`	`318`	`or`
`320`	`319`	`result = this.getMethod() and i = 1`
`321`	`320`	`or`
`322`	`321`	`result = this.getArguments() and i = 2`
	`322`	`+ or`
	`323`	`+ result = this.getBlock() and i = 3`
`323`	`324`	`}`
`324`	`325`	`}`
`325`	`326`