-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix emitting asm and object file output at the same time
LLVM doesn't really support reusing the same module to emit more than one file. One bug this causes is that the IR is invalidated by the stack coloring pass when emitting the first file, and then the IR verifier complains by the time we try to emit the second file. Also, we get different binaries with --emit=asm,link than with just --emit=link. In some cases leading to segfaults. Unfortunately, it seems that at this point in time, the most sensible option to circumvent this problem is to just clone the whole llvm module for the asm output if we need both, asm and obj file output. Fixes #24876 Fixes #26235
- Loading branch information
Showing
5 changed files
with
103 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
-include ../tools.mk | ||
|
||
all: | ||
$(RUSTC) -Copt-level=0 --emit=llvm-bc,llvm-ir,asm,obj,link test-24876.rs | ||
$(RUSTC) -Copt-level=1 --emit=llvm-bc,llvm-ir,asm,obj,link test-24876.rs | ||
$(RUSTC) -Copt-level=2 --emit=llvm-bc,llvm-ir,asm,obj,link test-24876.rs | ||
$(RUSTC) -Copt-level=3 --emit=llvm-bc,llvm-ir,asm,obj,link test-24876.rs | ||
$(RUSTC) -Copt-level=0 --emit=llvm-bc,llvm-ir,asm,obj,link test-26235.rs | ||
$(call RUN,test-26235) || exit 1 | ||
$(RUSTC) -Copt-level=1 --emit=llvm-bc,llvm-ir,asm,obj,link test-26235.rs | ||
$(call RUN,test-26235) || exit 1 | ||
$(RUSTC) -Copt-level=2 --emit=llvm-bc,llvm-ir,asm,obj,link test-26235.rs | ||
$(call RUN,test-26235) || exit 1 | ||
$(RUSTC) -Copt-level=3 --emit=llvm-bc,llvm-ir,asm,obj,link test-26235.rs | ||
$(call RUN,test-26235) || exit 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
// Checks for issue #24876 | ||
|
||
fn main() { | ||
let mut v = 0; | ||
for i in 0..0 { | ||
v += i; | ||
} | ||
println!("{}", v) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
// Checks for issue #26235 | ||
|
||
fn main() { | ||
use std::thread; | ||
|
||
type Key = u32; | ||
const NUM_THREADS: usize = 2; | ||
|
||
#[derive(Clone,Copy)] | ||
struct Stats<S> { | ||
upsert: S, | ||
delete: S, | ||
insert: S, | ||
update: S | ||
}; | ||
|
||
impl<S> Stats<S> where S: Copy { | ||
fn dot<B, F, T>(self, s: Stats<T>, f: F) -> Stats<B> where F: Fn(S, T) -> B { | ||
let Stats { upsert: u1, delete: d1, insert: i1, update: p1 } = self; | ||
let Stats { upsert: u2, delete: d2, insert: i2, update: p2 } = s; | ||
Stats { upsert: f(u1, u2), delete: f(d1, d2), insert: f(i1, i2), update: f(p1, p2) } | ||
} | ||
|
||
fn new(init: S) -> Self { | ||
Stats { upsert: init, delete: init, insert: init, update: init } | ||
} | ||
} | ||
|
||
fn make_threads() -> Vec<thread::JoinHandle<()>> { | ||
let mut t = Vec::with_capacity(NUM_THREADS); | ||
for _ in 0..NUM_THREADS { | ||
t.push(thread::spawn(move || {})); | ||
} | ||
t | ||
} | ||
|
||
let stats = [Stats::new(0); NUM_THREADS]; | ||
make_threads(); | ||
|
||
{ | ||
let Stats { ref upsert, ref delete, ref insert, ref update } = stats.iter().fold( | ||
Stats::new(0), |res, &s| res.dot(s, |x: Key, y: Key| x.wrapping_add(y))); | ||
println!("upserts: {}, deletes: {}, inserts: {}, updates: {}", | ||
upsert, delete, insert, update); | ||
} | ||
} |