wip2

Author: hvitved

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

@@ -292,7 +292,7 @@ module ExprTrees {
     }
   }
 
-  class CallExprTree extends StandardPostOrderTree instanceof ParenArgsExpr {
+  class ParenArgsExprTree extends StandardPostOrderTree instanceof ParenArgsExpr {
     override AstNode getChildNode(int i) {
       i = 0 and result = super.getBase()
       or

rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll

@@ -1015,8 +1015,10 @@ private module Cached {
   cached
   newtype TParameterPosition =
     TPositionalParameterPosition(int i) {
-      i in [0 .. max([any(ParamList l).getNumberOfParams(), any(ArgList l).getNumberOfArgs()]) - 1] or
-      FlowSummaryImpl::ParsePositions::isParsedArgumentPosition(_, i) or
+      i in [0 .. max([any(ParamList l).getNumberOfParams(), any(ArgList l).getNumberOfArgs()]) - 1]
+      or
+      FlowSummaryImpl::ParsePositions::isParsedArgumentPosition(_, i)
+      or
       FlowSummaryImpl::ParsePositions::isParsedParameterPosition(_, i)
     } or
     TClosureSelfParameterPosition() or

rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll

@@ -188,13 +188,7 @@ predicate capturedCallWrite(Expr call, BasicBlock bb, int i, Variable v) {
 
 /** Holds if `v` may be mutably borrowed in `e`. */
 private predicate mutablyBorrows(Expr e, Variable v) {
-  (
-    e = any(MethodCallExpr mc).getReceiver()
-    or
-    e = any(IndexExpr ie).getBase()
-    or
-    e = any(Operation o | o.isOverloaded(_, _, any(int borrows | borrows >= 1))).getOperand(0)
-  ) and
+  e = any(MethodCallExpr mc).getReceiver() and
   e.(VariableAccess).getVariable() = v and
   v.isMutable()
   or

rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected

@@ -1,15 +1,15 @@
 instances
-| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) |
-| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) |
+| gen_method_call_expr.rs:8:5:8:13 | x.foo(...) |
+| gen_method_call_expr.rs:9:5:9:25 | x.foo(...) |
 getArgList
-| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | gen_method_call_expr.rs:5:10:5:13 | ArgList |
-| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | gen_method_call_expr.rs:6:22:6:25 | ArgList |
+| gen_method_call_expr.rs:8:5:8:13 | x.foo(...) | gen_method_call_expr.rs:8:10:8:13 | ArgList |
+| gen_method_call_expr.rs:9:5:9:25 | x.foo(...) | gen_method_call_expr.rs:9:22:9:25 | ArgList |
 getAttr
 getGenericArgList
-| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | gen_method_call_expr.rs:6:10:6:21 | <...> |
+| gen_method_call_expr.rs:9:5:9:25 | x.foo(...) | gen_method_call_expr.rs:9:10:9:21 | <...> |
 getIdentifier
-| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | gen_method_call_expr.rs:5:7:5:9 | foo |
-| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | gen_method_call_expr.rs:6:7:6:9 | foo |
+| gen_method_call_expr.rs:8:5:8:13 | x.foo(...) | gen_method_call_expr.rs:8:7:8:9 | foo |
+| gen_method_call_expr.rs:9:5:9:25 | x.foo(...) | gen_method_call_expr.rs:9:7:9:9 | foo |
 getReceiver
-| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | gen_method_call_expr.rs:5:5:5:5 | x |
-| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | gen_method_call_expr.rs:6:5:6:5 | x |
+| gen_method_call_expr.rs:8:5:8:13 | x.foo(...) | gen_method_call_expr.rs:8:5:8:5 | x |
+| gen_method_call_expr.rs:9:5:9:25 | x.foo(...) | gen_method_call_expr.rs:9:5:9:5 | x |

rust/ql/test/library-tests/dataflow/global/CONSISTENCY/PathResolutionConsistency.expected

@@ -1,4 +1,3 @@
 multipleCallTargets
-| main.rs:228:10:228:14 | * ... |
 | main.rs:236:11:236:15 | * ... |
 | main.rs:272:13:272:29 | * ... |