Auto merge of #28350 - dotdash:llvm_fix, r=eddyb

This commit is contained in:
bors 2015-09-11 23:03:47 +00:00
commit 33f0920d0e
3 changed files with 7 additions and 3 deletions

@ -1 +1 @@
Subproject commit 168f91ce5cbf8933e47f339911f0f46a48714852
Subproject commit 3c88bf78f97d2cd8130b16eecb0eeb84888cd494

View File

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

View File

@ -11,12 +11,16 @@
// no-prefer-dynamic
// aux-build:allocator-dummy.rs
#![feature(test)]
extern crate allocator_dummy;
extern crate test;
fn main() {
unsafe {
let before = allocator_dummy::HITS;
let b = Box::new(3);
let mut b = Box::new(3);
test::black_box(&mut b); // Make sure the allocation is not optimized away
assert_eq!(allocator_dummy::HITS - before, 1);
drop(b);
assert_eq!(allocator_dummy::HITS - before, 2);