Ruby: CFG: fix completion of AsPattern variable

aibaars · aibaars · commit 77a3e4bd61db · 2022-01-24T10:10:22.000+01:00
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll
@@ -711,7 +711,8 @@ module Trees {
       last(this.getPattern(), last, c) and
       c.(MatchingCompletion).getValue() = false
       or
-      last(this.getVariableAccess(), last, c)
+      last(this.getVariableAccess(), last, any(SimpleCompletion x)) and
+      c.(MatchingCompletion).getValue() = true
     }
 
     final override predicate succ(AstNode pred, AstNode succ, Completion c) {
diff --git a/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected b/ruby/ql/test/library-tests/controlflow/graph/Cfg.expected
@@ -1190,8 +1190,14 @@ case.rb:
 #-----| match -> x
 
 #   82| x
+#-----| match -> 1
+
+#   82| then ...
 #-----|  -> case ...
 
+#   82| 1
+#-----|  -> then ...
+
 #   83| in ... then ...
 #-----|  -> ... | ...
 
diff --git a/ruby/ql/test/library-tests/controlflow/graph/case.rb b/ruby/ql/test/library-tests/controlflow/graph/case.rb
@@ -79,7 +79,7 @@ def case_match_various value
     in 5 .. 10
     in .. 10
     in 5 ..
-    in 5 => x
+    in 5 => x then 1
     in 5 | ^foo | "string"
     in ::Foo::Bar
     in -> x { x == 10 }

Original file line number	Diff line number	Diff line change
`@@ -711,7 +711,8 @@ module Trees {`
`711`	`711`	`last(this.getPattern(), last, c) and`
`712`	`712`	`c.(MatchingCompletion).getValue() = false`
`713`	`713`	`or`
`714`		`- last(this.getVariableAccess(), last, c)`
	`714`	`+ last(this.getVariableAccess(), last, any(SimpleCompletion x)) and`
	`715`	`+ c.(MatchingCompletion).getValue() = true`
`715`	`716`	`}`
`716`	`717`
`717`	`718`	`final override predicate succ(AstNode pred, AstNode succ, Completion c) {`