about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-04-07 07:54:39 -0700
committerbors <bors@rust-lang.org>2016-04-07 07:54:39 -0700
commit470ca1c3ff33cd046f71a5453f8f520da4cd387e (patch)
treea3a7cefb1a62d0a01f28d08409007b2cbdd72990 /src/liballoc
parent444a118a8932c99b902548cb7ca8c249222c053a (diff)
parentb0f81a3595febee93c853d561beca12eb917df8d (diff)
downloadrust-470ca1c3ff33cd046f71a5453f8f520da4cd387e.tar.gz
rust-470ca1c3ff33cd046f71a5453f8f520da4cd387e.zip
Auto merge of #32794 - Manishearth:rollup, r=Manishearth
Rollup of 7 pull requests

- Successful merges: #32674, #32699, #32711, #32745, #32748, #32757, #32789
- Failed merges:
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/arc.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs
index 055029dddcd..e1f698cb484 100644
--- a/src/liballoc/arc.rs
+++ b/src/liballoc/arc.rs
@@ -263,6 +263,7 @@ impl<T: ?Sized> Arc<T> {
         loop {
             // check if the weak counter is currently "locked"; if so, spin.
             if cur == usize::MAX {
+                cur = this.inner().weak.load(Relaxed);
                 continue;
             }