Fix CFG

Author: aibaars

ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll

@@ -371,7 +371,9 @@ module Trees {
     CallTree() {
       // Logical operations are handled separately
       not this instanceof UnaryLogicalOperation and
-      not this instanceof BinaryLogicalOperation
+      not this instanceof BinaryLogicalOperation and
+      // Calls with the `&.` operator are desugared
+      not this.(MethodCall).isSafeNavigation()
     }
 
     override ControlFlowTree getChildElement(int i) { result = this.getArgument(i) }

ruby/ql/test/library-tests/controlflow/graph/Cfg.expected

@@ -3593,7 +3593,6 @@ cfg.rb:
 #-----|  -> do ... end
 
 #  202| call to times
-#-----|  -> self
 #-----|  -> __synth__0__1
 
 #  202| do ... end
@@ -3636,7 +3635,6 @@ cfg.rb:
 
 #  205| call to foo
 #-----|  -> ... = ...
-#-----|  -> 1
 
 #  205| nil
 #-----|  -> if ...
@@ -3647,9 +3645,6 @@ cfg.rb:
 #  205| ...
 #-----|  -> exit cfg.rb (normal)
 
-#  205| call to bar
-#-----|  -> exit cfg.rb (normal)
-
 #  205| call to bar
 #-----|  -> if ...
 
@@ -3679,7 +3674,6 @@ cfg.rb:
 
 #  205| { ... }
 #-----|  -> call to bar
-#-----|  -> call to bar
 
 #  205| x
 #-----|  -> x

ruby/ql/test/library-tests/controlflow/graph/Nodes.expected

@@ -205,8 +205,6 @@ positionalArguments
 | cfg.rb:200:18:200:30 | call to puts | cfg.rb:200:30:200:30 | a |
 | cfg.rb:202:19:202:31 | call to puts | cfg.rb:202:31:202:31 | c |
 | cfg.rb:205:1:205:23 | call to bar | cfg.rb:205:10:205:10 | 1 |
-| cfg.rb:205:1:205:23 | call to bar | cfg.rb:205:10:205:10 | 1 |
-| cfg.rb:205:1:205:23 | call to bar | cfg.rb:205:12:205:12 | 2 |
 | cfg.rb:205:1:205:23 | call to bar | cfg.rb:205:12:205:12 | 2 |
 | cfg.rb:205:4:205:5 | call to == | cfg.rb:205:1:205:3 | __synth__0__1 |
 | desugar.rb:2:5:2:6 | ... + ... | desugar.rb:2:8:2:8 | 1 |