diff options
| author | bors <bors@rust-lang.org> | 2016-06-03 04:09:31 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-06-03 04:09:31 -0700 |
| commit | 9552bcdd92dfd09049ce9dd299b4bfc513ac075d (patch) | |
| tree | 30e4ca00974aaf0c10b6a8ac546cd5e63026fda0 /src/libstd/sys/windows | |
| parent | 95206f438f1573e95601f06b315a151de010e92f (diff) | |
| parent | fc4b35612550d833cefcd586cb13ebc0dc5a51e1 (diff) | |
| download | rust-9552bcdd92dfd09049ce9dd299b4bfc513ac075d.tar.gz rust-9552bcdd92dfd09049ce9dd299b4bfc513ac075d.zip | |
Auto merge of #33861 - Amanieu:lock_elision_fix, r=alexcrichton
Make sure Mutex and RwLock can't be re-locked on the same thread Fixes #33770 r? @alexcrichton
Diffstat (limited to 'src/libstd/sys/windows')
| -rw-r--r-- | src/libstd/sys/windows/mutex.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/sys/windows/mutex.rs b/src/libstd/sys/windows/mutex.rs index b770156582d..8762b34e3da 100644 --- a/src/libstd/sys/windows/mutex.rs +++ b/src/libstd/sys/windows/mutex.rs @@ -64,6 +64,8 @@ impl Mutex { held: UnsafeCell::new(false), } } + #[inline] + pub unsafe fn init(&mut self) {} pub unsafe fn lock(&self) { match kind() { Kind::SRWLock => c::AcquireSRWLockExclusive(raw(self)), |