]> git.ipfire.org Git - thirdparty/valgrind.git/commit
Bug 359201 followup. futex skips argument 5 if op is FUTEX_WAIT_BITSET.
authorMark Wielaard <mark@klomp.org>
Thu, 18 Feb 2016 11:14:47 +0000 (11:14 +0000)
committerMark Wielaard <mark@klomp.org>
Thu, 18 Feb 2016 11:14:47 +0000 (11:14 +0000)
commit54794decc89e47edab385196ffa9301218a36407
tree4343902a73d213d7013af8607bf73c51643b48bf
parentbe2da24d6c23e6376ba6e7435049eb54a0d8e935
Bug 359201 followup. futex skips argument 5 if op is FUTEX_WAIT_BITSET.

The original fix in svn r15793 read argument 6 separately by using PRA6
unconditionally. This is wrong. We need to first check whether a
track_pre_reg_read callback is registered (only memcheck does).
The PRE_REG_READX macro already had this check. Just add the same
before calling PRA6. Thanks to Tom Hughes for noticing. Without this
helgrind/tests/cond_timedwait_test and drd/tests/pth_inconsistent_cond_wait
regtests would fail.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15795
coregrind/m_syswrap/syswrap-linux.c