Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Error on must-relocking of non-recursive mutex #1628

Merged
merged 4 commits into from
Nov 29, 2024
Merged

Error on must-relocking of non-recursive mutex #1628

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f2f0c12
Error on must-relocking of non-recursive mutex
sim642 Nov 14, 2024
dbdefab
Fix must-double-locking in regression tests
sim642 Nov 29, 2024
218770b
Check must-double-locking in 03-practical/21-pfscan_combine_minimal
sim642 Nov 29, 2024
f3dfca7
Change must-double-locking in 03-practical/21-pfscan_combine_minimal …
sim642 Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/analyses/mutexAnalysis.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,17 @@ struct

let add ctx ((addr, rw): AddrRW.t): D.t =
match addr with
| Addr mv ->
| Addr ((v, o) as mv) ->
let (s, m) = ctx.local in
let s' = MustLocksetRW.add_mval_rw (mv, rw) s in
let m' =
if MutexTypeAnalysis.must_be_recursive ctx mv then
MustMultiplicity.increment mv m
else
match ctx.ask (Queries.MutexType (v, Offset.Unit.of_offs o)) with
| `Lifted Recursive -> MustMultiplicity.increment mv m
| `Lifted NonRec ->
if MustLocksetRW.mem_mval mv s then
M.error ~category:M.Category.Behavior.Undefined.double_locking "Acquiring a non-recursive mutex that is already held";
m
| `Bot | `Top -> m
in
(s', m')
| NullPtr ->
Expand Down
Loading