about summary refs log tree commit diff
path: root/src/test/run-make
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-06-04 23:49:29 -0700
committerbors <bors@rust-lang.org>2016-06-04 23:49:29 -0700
commitf97c411548f2b64f74f2bcb84dcc37075c05e2a0 (patch)
tree78f88d09614f89ea7e955252407bc0da5f02332b /src/test/run-make
parentccfaaa7d989356ff440e9960da28909491e2f00d (diff)
parent063f8826e7addbe644e3dfd532736ce72d8990bc (diff)
downloadrust-f97c411548f2b64f74f2bcb84dcc37075c05e2a0.tar.gz
rust-f97c411548f2b64f74f2bcb84dcc37075c05e2a0.zip
Auto merge of #33622 - arielb1:elaborate-drops, r=nikomatsakis
[MIR] non-zeroing drop

This enables non-zeroing drop through stack flags for MIR.

Fixes #30380.
Fixes #5016.
Diffstat (limited to 'src/test/run-make')
-rw-r--r--src/test/run-make/atomic-lock-free/atomic_lock_free.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/run-make/atomic-lock-free/atomic_lock_free.rs b/src/test/run-make/atomic-lock-free/atomic_lock_free.rs
index 8731cd960f3..023f2218b87 100644
--- a/src/test/run-make/atomic-lock-free/atomic_lock_free.rs
+++ b/src/test/run-make/atomic-lock-free/atomic_lock_free.rs
@@ -18,6 +18,8 @@ extern "rust-intrinsic" {
 
 #[lang = "sized"]
 trait Sized {}
+#[lang = "copy"]
+trait Copy {}
 
 #[cfg(target_has_atomic = "8")]
 pub unsafe fn atomic_u8(x: *mut u8) {