Skip to content

Commit 33f0920

Browse files
committed
Auto merge of #28350 - dotdash:llvm_fix, r=eddyb
2 parents c8ded9a + e8c398d commit 33f0920

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

src/llvm

src/rustllvm/llvm-auto-clean-trigger

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
22
# The actual contents of this file do not matter, but to trigger a change on the
33
# build bots then the contents should be changed so git updates the mtime.
4-
2015-09-02
4+
2015-09-11

src/test/run-pass/allocator-override.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@
1111
// no-prefer-dynamic
1212
// aux-build:allocator-dummy.rs
1313

14+
#![feature(test)]
15+
1416
extern crate allocator_dummy;
17+
extern crate test;
1518

1619
fn main() {
1720
unsafe {
1821
let before = allocator_dummy::HITS;
19-
let b = Box::new(3);
22+
let mut b = Box::new(3);
23+
test::black_box(&mut b); // Make sure the allocation is not optimized away
2024
assert_eq!(allocator_dummy::HITS - before, 1);
2125
drop(b);
2226
assert_eq!(allocator_dummy::HITS - before, 2);

0 commit comments

Comments
 (0)