Skip to content

Commit f53de13

Browse files
aibaarsaibaars
authored
Merge pull request #19024 from github/aibaars/mut-borrow
Rust: SSA: restrict mutablyBorrowed to variables with a 'mut' modifier
2 parents f8d1e3f + 1e94245 commit f53de13

File tree

3 files changed

+3
-39
lines changed

3 files changed

+3
-39
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,8 @@ predicate capturedCallWrite(Expr call, BasicBlock bb, int i, Variable v) {
212212
/** Holds if `v` may be mutably borrowed in `e`. */
213213
private predicate mutablyBorrows(Expr e, Variable v) {
214214
e = any(MethodCallExpr mc).getReceiver() and
215-
e.(VariableAccess).getVariable() = v
215+
e.(VariableAccess).getVariable() = v and
216+
v.isMutable()
216217
or
217218
exists(RefExpr re | re = e and re.isMut() and re.getExpr().(VariableAccess).getVariable() = v)
218219
}

‎rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ module Impl {
161161
}
162162

163163
/** Hold is this variable is mutable. */
164-
predicate isMutable() { this.getPat().isMut() }
164+
predicate isMutable() { this.getPat().isMut() or this.getSelfParam().isMut() }
165165

166166
/** Hold is this variable is immutable. */
167167
predicate isImmutable() { not this.isMutable() }

‎rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -316,15 +316,13 @@ localStep
316316
| main.rs:263:9:263:10 | i1 | main.rs:263:9:263:10 | i1 |
317317
| main.rs:263:14:263:16 | TryExpr | main.rs:263:9:263:10 | i1 |
318318
| main.rs:266:5:266:11 | Some(...) | main.rs:260:41:267:1 | { ... } |
319-
| main.rs:270:9:270:10 | [SSA] r1 | main.rs:271:29:271:30 | [SSA] r1 |
320319
| main.rs:270:9:270:10 | [SSA] r1 | main.rs:271:29:271:30 | r1 |
321320
| main.rs:270:9:270:10 | r1 | main.rs:270:9:270:10 | [SSA] r1 |
322321
| main.rs:270:9:270:10 | r1 | main.rs:270:9:270:10 | r1 |
323322
| main.rs:270:33:270:46 | Ok(...) | main.rs:270:9:270:10 | r1 |
324323
| main.rs:271:9:271:11 | [SSA] o1a | main.rs:273:10:273:12 | o1a |
325324
| main.rs:271:9:271:11 | o1a | main.rs:271:9:271:11 | [SSA] o1a |
326325
| main.rs:271:9:271:11 | o1a | main.rs:271:9:271:11 | o1a |
327-
| main.rs:271:29:271:30 | [SSA] r1 | main.rs:272:29:272:30 | r1 |
328326
| main.rs:271:29:271:30 | [post] r1 | main.rs:272:29:272:30 | r1 |
329327
| main.rs:271:29:271:30 | [post] receiver for r1 | main.rs:271:29:271:30 | [post] r1 |
330328
| main.rs:271:29:271:30 | r1 | main.rs:271:29:271:30 | receiver for r1 |
@@ -340,15 +338,13 @@ localStep
340338
| main.rs:273:10:273:12 | o1a | main.rs:273:10:273:12 | receiver for o1a |
341339
| main.rs:274:10:274:12 | [post] receiver for o1b | main.rs:274:10:274:12 | [post] o1b |
342340
| main.rs:274:10:274:12 | o1b | main.rs:274:10:274:12 | receiver for o1b |
343-
| main.rs:276:9:276:10 | [SSA] r2 | main.rs:277:29:277:30 | [SSA] r2 |
344341
| main.rs:276:9:276:10 | [SSA] r2 | main.rs:277:29:277:30 | r2 |
345342
| main.rs:276:9:276:10 | r2 | main.rs:276:9:276:10 | [SSA] r2 |
346343
| main.rs:276:9:276:10 | r2 | main.rs:276:9:276:10 | r2 |
347344
| main.rs:276:33:276:47 | Err(...) | main.rs:276:9:276:10 | r2 |
348345
| main.rs:277:9:277:11 | [SSA] o2a | main.rs:279:10:279:12 | o2a |
349346
| main.rs:277:9:277:11 | o2a | main.rs:277:9:277:11 | [SSA] o2a |
350347
| main.rs:277:9:277:11 | o2a | main.rs:277:9:277:11 | o2a |
351-
| main.rs:277:29:277:30 | [SSA] r2 | main.rs:278:29:278:30 | r2 |
352348
| main.rs:277:29:277:30 | [post] r2 | main.rs:278:29:278:30 | r2 |
353349
| main.rs:277:29:277:30 | [post] receiver for r2 | main.rs:277:29:277:30 | [post] r2 |
354350
| main.rs:277:29:277:30 | r2 | main.rs:277:29:277:30 | receiver for r2 |
@@ -389,24 +385,20 @@ localStep
389385
| main.rs:291:9:291:10 | i3 | main.rs:291:9:291:10 | i3 |
390386
| main.rs:291:14:291:16 | TryExpr | main.rs:291:9:291:10 | i3 |
391387
| main.rs:293:5:293:9 | Ok(...) | main.rs:283:46:294:1 | { ... } |
392-
| main.rs:297:9:297:10 | [SSA] s1 | main.rs:298:10:298:11 | [SSA] s1 |
393388
| main.rs:297:9:297:10 | [SSA] s1 | main.rs:298:10:298:11 | s1 |
394389
| main.rs:297:9:297:10 | s1 | main.rs:297:9:297:10 | [SSA] s1 |
395390
| main.rs:297:9:297:10 | s1 | main.rs:297:9:297:10 | s1 |
396391
| main.rs:297:32:297:45 | Ok(...) | main.rs:297:9:297:10 | s1 |
397-
| main.rs:298:10:298:11 | [SSA] s1 | main.rs:299:10:299:11 | s1 |
398392
| main.rs:298:10:298:11 | [post] receiver for s1 | main.rs:298:10:298:11 | [post] s1 |
399393
| main.rs:298:10:298:11 | [post] s1 | main.rs:299:10:299:11 | s1 |
400394
| main.rs:298:10:298:11 | s1 | main.rs:298:10:298:11 | receiver for s1 |
401395
| main.rs:298:10:298:11 | s1 | main.rs:299:10:299:11 | s1 |
402396
| main.rs:299:10:299:11 | [post] receiver for s1 | main.rs:299:10:299:11 | [post] s1 |
403397
| main.rs:299:10:299:11 | s1 | main.rs:299:10:299:11 | receiver for s1 |
404-
| main.rs:301:9:301:10 | [SSA] s2 | main.rs:302:10:302:11 | [SSA] s2 |
405398
| main.rs:301:9:301:10 | [SSA] s2 | main.rs:302:10:302:11 | s2 |
406399
| main.rs:301:9:301:10 | s2 | main.rs:301:9:301:10 | [SSA] s2 |
407400
| main.rs:301:9:301:10 | s2 | main.rs:301:9:301:10 | s2 |
408401
| main.rs:301:32:301:46 | Err(...) | main.rs:301:9:301:10 | s2 |
409-
| main.rs:302:10:302:11 | [SSA] s2 | main.rs:303:10:303:11 | s2 |
410402
| main.rs:302:10:302:11 | [post] receiver for s2 | main.rs:302:10:302:11 | [post] s2 |
411403
| main.rs:302:10:302:11 | [post] s2 | main.rs:303:10:303:11 | s2 |
412404
| main.rs:302:10:302:11 | s2 | main.rs:302:10:302:11 | receiver for s2 |
@@ -698,16 +690,13 @@ localStep
698690
| main.rs:462:16:462:16 | s | main.rs:462:16:462:16 | s |
699691
| main.rs:462:16:462:24 | ...: String | main.rs:462:16:462:16 | s |
700692
| main.rs:463:14:463:20 | FormatArgsExpr | main.rs:463:14:463:20 | MacroExpr |
701-
| main.rs:467:9:467:9 | [SSA] a | main.rs:468:13:468:13 | [SSA] a |
702693
| main.rs:467:9:467:9 | [SSA] a | main.rs:468:13:468:13 | a |
703694
| main.rs:467:9:467:9 | a | main.rs:467:9:467:9 | [SSA] a |
704695
| main.rs:467:9:467:9 | a | main.rs:467:9:467:9 | a |
705696
| main.rs:467:13:467:22 | source(...) | main.rs:467:9:467:9 | a |
706-
| main.rs:468:9:468:9 | [SSA] b | main.rs:469:13:469:13 | [SSA] b |
707697
| main.rs:468:9:468:9 | [SSA] b | main.rs:469:13:469:13 | b |
708698
| main.rs:468:9:468:9 | b | main.rs:468:9:468:9 | [SSA] b |
709699
| main.rs:468:9:468:9 | b | main.rs:468:9:468:9 | b |
710-
| main.rs:468:13:468:13 | [SSA] a | main.rs:472:10:472:10 | a |
711700
| main.rs:468:13:468:13 | [post] a | main.rs:472:10:472:10 | a |
712701
| main.rs:468:13:468:13 | [post] receiver for a | main.rs:468:13:468:13 | [post] a |
713702
| main.rs:468:13:468:13 | a | main.rs:468:13:468:13 | receiver for a |
@@ -716,21 +705,16 @@ localStep
716705
| main.rs:469:9:469:9 | [SSA] c | main.rs:474:10:474:10 | c |
717706
| main.rs:469:9:469:9 | c | main.rs:469:9:469:9 | [SSA] c |
718707
| main.rs:469:9:469:9 | c | main.rs:469:9:469:9 | c |
719-
| main.rs:469:13:469:13 | [SSA] b | main.rs:470:19:470:19 | [SSA] b |
720-
| main.rs:469:13:469:13 | [SSA] b | main.rs:470:19:470:19 | b |
721-
| main.rs:469:13:469:13 | [post] b | main.rs:470:19:470:19 | [SSA] b |
722708
| main.rs:469:13:469:13 | [post] b | main.rs:470:19:470:19 | b |
723709
| main.rs:469:13:469:13 | [post] receiver for b | main.rs:469:13:469:13 | [post] b |
724710
| main.rs:469:13:469:13 | b | main.rs:469:13:469:13 | receiver for b |
725-
| main.rs:469:13:469:13 | b | main.rs:470:19:470:19 | [SSA] b |
726711
| main.rs:469:13:469:13 | b | main.rs:470:19:470:19 | b |
727712
| main.rs:469:13:469:28 | [post] receiver for b.parse(...) | main.rs:469:13:469:28 | [post] b.parse(...) |
728713
| main.rs:469:13:469:28 | b.parse(...) | main.rs:469:13:469:28 | receiver for b.parse(...) |
729714
| main.rs:469:13:469:37 | ... .unwrap(...) | main.rs:469:9:469:9 | c |
730715
| main.rs:470:9:470:9 | [SSA] d | main.rs:475:10:475:10 | d |
731716
| main.rs:470:9:470:9 | d | main.rs:470:9:470:9 | [SSA] d |
732717
| main.rs:470:9:470:9 | d | main.rs:470:9:470:9 | d |
733-
| main.rs:470:19:470:19 | [SSA] b | main.rs:473:17:473:17 | b |
734718
| main.rs:470:19:470:19 | [post] b | main.rs:473:17:473:17 | b |
735719
| main.rs:470:19:470:19 | [post] receiver for b | main.rs:470:19:470:19 | [post] b |
736720
| main.rs:470:19:470:19 | b | main.rs:470:19:470:19 | receiver for b |
@@ -742,23 +726,16 @@ localStep
742726
| main.rs:479:9:479:10 | vs | main.rs:479:9:479:10 | [SSA] vs |
743727
| main.rs:479:9:479:10 | vs | main.rs:479:9:479:10 | vs |
744728
| main.rs:479:14:479:34 | [...] | main.rs:479:9:479:10 | vs |
745-
| main.rs:481:10:481:11 | [post] vs | main.rs:482:11:482:12 | [SSA] vs |
746729
| main.rs:481:10:481:11 | [post] vs | main.rs:482:11:482:12 | vs |
747-
| main.rs:481:10:481:11 | vs | main.rs:482:11:482:12 | [SSA] vs |
748730
| main.rs:481:10:481:11 | vs | main.rs:482:11:482:12 | vs |
749-
| main.rs:482:11:482:12 | [SSA] vs | main.rs:483:11:483:12 | [SSA] vs |
750-
| main.rs:482:11:482:12 | [SSA] vs | main.rs:483:11:483:12 | vs |
751731
| main.rs:482:11:482:12 | [post] receiver for vs | main.rs:482:11:482:12 | [post] vs |
752-
| main.rs:482:11:482:12 | [post] vs | main.rs:483:11:483:12 | [SSA] vs |
753732
| main.rs:482:11:482:12 | [post] vs | main.rs:483:11:483:12 | vs |
754733
| main.rs:482:11:482:12 | vs | main.rs:482:11:482:12 | receiver for vs |
755-
| main.rs:482:11:482:12 | vs | main.rs:483:11:483:12 | [SSA] vs |
756734
| main.rs:482:11:482:12 | vs | main.rs:483:11:483:12 | vs |
757735
| main.rs:482:11:482:19 | [post] receiver for vs.iter(...) | main.rs:482:11:482:19 | [post] vs.iter(...) |
758736
| main.rs:482:11:482:19 | vs.iter(...) | main.rs:482:11:482:19 | receiver for vs.iter(...) |
759737
| main.rs:482:11:482:26 | ... .next(...) | main.rs:482:11:482:26 | receiver for ... .next(...) |
760738
| main.rs:482:11:482:26 | [post] receiver for ... .next(...) | main.rs:482:11:482:26 | [post] ... .next(...) |
761-
| main.rs:483:11:483:12 | [SSA] vs | main.rs:485:14:485:15 | vs |
762739
| main.rs:483:11:483:12 | [post] receiver for vs | main.rs:483:11:483:12 | [post] vs |
763740
| main.rs:483:11:483:12 | [post] vs | main.rs:485:14:485:15 | vs |
764741
| main.rs:483:11:483:12 | vs | main.rs:483:11:483:12 | receiver for vs |
@@ -770,51 +747,37 @@ localStep
770747
| main.rs:485:9:485:9 | [SSA] v | main.rs:486:14:486:14 | v |
771748
| main.rs:485:9:485:9 | v | main.rs:485:9:485:9 | [SSA] v |
772749
| main.rs:485:9:485:9 | v | main.rs:485:9:485:9 | v |
773-
| main.rs:485:14:485:15 | vs | main.rs:488:15:488:16 | [SSA] vs |
774750
| main.rs:485:14:485:15 | vs | main.rs:488:15:488:16 | vs |
775751
| main.rs:488:10:488:10 | [SSA] v | main.rs:489:14:489:14 | v |
776752
| main.rs:488:10:488:10 | v | main.rs:488:10:488:10 | [SSA] v |
777753
| main.rs:488:10:488:10 | v | main.rs:488:10:488:10 | v |
778-
| main.rs:488:15:488:16 | [SSA] vs | main.rs:492:27:492:28 | [SSA] vs |
779-
| main.rs:488:15:488:16 | [SSA] vs | main.rs:492:27:492:28 | vs |
780754
| main.rs:488:15:488:16 | [post] receiver for vs | main.rs:488:15:488:16 | [post] vs |
781-
| main.rs:488:15:488:16 | [post] vs | main.rs:492:27:492:28 | [SSA] vs |
782755
| main.rs:488:15:488:16 | [post] vs | main.rs:492:27:492:28 | vs |
783756
| main.rs:488:15:488:16 | vs | main.rs:488:15:488:16 | receiver for vs |
784-
| main.rs:488:15:488:16 | vs | main.rs:492:27:492:28 | [SSA] vs |
785757
| main.rs:488:15:488:16 | vs | main.rs:492:27:492:28 | vs |
786758
| main.rs:492:9:492:11 | [SSA] vs2 | main.rs:493:15:493:17 | vs2 |
787759
| main.rs:492:9:492:11 | vs2 | main.rs:492:9:492:11 | [SSA] vs2 |
788760
| main.rs:492:9:492:11 | vs2 | main.rs:492:9:492:11 | vs2 |
789-
| main.rs:492:27:492:28 | [SSA] vs | main.rs:497:5:497:6 | [SSA] vs |
790-
| main.rs:492:27:492:28 | [SSA] vs | main.rs:497:5:497:6 | vs |
791761
| main.rs:492:27:492:28 | [post] receiver for vs | main.rs:492:27:492:28 | [post] vs |
792-
| main.rs:492:27:492:28 | [post] vs | main.rs:497:5:497:6 | [SSA] vs |
793762
| main.rs:492:27:492:28 | [post] vs | main.rs:497:5:497:6 | vs |
794763
| main.rs:492:27:492:28 | vs | main.rs:492:27:492:28 | receiver for vs |
795-
| main.rs:492:27:492:28 | vs | main.rs:497:5:497:6 | [SSA] vs |
796764
| main.rs:492:27:492:28 | vs | main.rs:497:5:497:6 | vs |
797765
| main.rs:492:27:492:35 | [post] receiver for vs.iter(...) | main.rs:492:27:492:35 | [post] vs.iter(...) |
798766
| main.rs:492:27:492:35 | vs.iter(...) | main.rs:492:27:492:35 | receiver for vs.iter(...) |
799767
| main.rs:492:27:492:45 | ... .collect(...) | main.rs:492:9:492:11 | vs2 |
800768
| main.rs:493:10:493:10 | [SSA] v | main.rs:494:14:494:14 | v |
801769
| main.rs:493:10:493:10 | v | main.rs:493:10:493:10 | [SSA] v |
802770
| main.rs:493:10:493:10 | v | main.rs:493:10:493:10 | v |
803-
| main.rs:497:5:497:6 | [SSA] vs | main.rs:498:5:498:6 | [SSA] vs |
804-
| main.rs:497:5:497:6 | [SSA] vs | main.rs:498:5:498:6 | vs |
805771
| main.rs:497:5:497:6 | [post] receiver for vs | main.rs:497:5:497:6 | [post] vs |
806-
| main.rs:497:5:497:6 | [post] vs | main.rs:498:5:498:6 | [SSA] vs |
807772
| main.rs:497:5:497:6 | [post] vs | main.rs:498:5:498:6 | vs |
808773
| main.rs:497:5:497:6 | vs | main.rs:497:5:497:6 | receiver for vs |
809-
| main.rs:497:5:497:6 | vs | main.rs:498:5:498:6 | [SSA] vs |
810774
| main.rs:497:5:497:6 | vs | main.rs:498:5:498:6 | vs |
811775
| main.rs:497:5:497:13 | [post] receiver for vs.iter(...) | main.rs:497:5:497:13 | [post] vs.iter(...) |
812776
| main.rs:497:5:497:13 | vs.iter(...) | main.rs:497:5:497:13 | receiver for vs.iter(...) |
813777
| main.rs:497:20:497:20 | ... | main.rs:497:20:497:20 | x |
814778
| main.rs:497:20:497:20 | [SSA] x | main.rs:497:29:497:29 | x |
815779
| main.rs:497:20:497:20 | x | main.rs:497:20:497:20 | [SSA] x |
816780
| main.rs:497:20:497:20 | x | main.rs:497:20:497:20 | x |
817-
| main.rs:498:5:498:6 | [SSA] vs | main.rs:500:14:500:15 | vs |
818781
| main.rs:498:5:498:6 | [post] receiver for vs | main.rs:498:5:498:6 | [post] vs |
819782
| main.rs:498:5:498:6 | [post] vs | main.rs:500:14:500:15 | vs |
820783
| main.rs:498:5:498:6 | vs | main.rs:498:5:498:6 | receiver for vs |

0 commit comments

Comments
 (0)