Skip to content

Commit aca22a8

Browse files
committedNov 13, 2017
Auto merge of #45824 - dotdash:stack_pop, r=alexcrichton
Update LLVM to fix miscompiles with -Copt-level=z on Windows Fixes #45034
2 parents b7ccb0a + 1a8c9f8 commit aca22a8

File tree

4 files changed

+36
-2
lines changed

4 files changed

+36
-2
lines changed
 

‎src/rustllvm/llvm-rebuild-trigger

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# If this file is modified, then llvm will be (optionally) 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-
2017-07-18
4+
2017-11-07
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
-include ../tools.mk
2+
3+
all:
4+
$(RUSTC) foo.rs -Copt-level=z 2>&1
5+
$(call RUN,foo)
+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![feature(test)]
12+
extern crate test;
13+
14+
fn foo(x: i32, y: i32) -> i64 {
15+
(x + y) as i64
16+
}
17+
18+
#[inline(never)]
19+
fn bar() {
20+
let _f = Box::new(0);
21+
// This call used to trigger an LLVM bug in opt-level z where the base
22+
// pointer gets corrupted, see issue #45034
23+
let y: fn(i32, i32) -> i64 = test::black_box(foo);
24+
test::black_box(y(1, 2));
25+
}
26+
27+
fn main() {
28+
bar();
29+
}

0 commit comments

Comments
 (0)
Please sign in to comment.