OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #29134 - wthrowe:linker-output-ICE, r=pnkfelix 

The escaped form isn't pretty, but this should be a very rare error.
Having a general binary-escaping string creation function might be a
good idea, though.

Closes #29122
This commit is contained in:
bors 2015-10-18 08:20:38 +00:00
parent 4af89fe317 d12522c25e
commit 9d7c5e5d3d
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/librustc_trans/back/link.rs
View File

@ -32,6 +32,8 @@ use util::sha2::{Digest, Sha256};
use util::fs::fix_windows_verbatim_for_gcc;
use rustc_back::tempdir::TempDir;
use std::ascii;
use std::char;
use std::env;
use std::ffi::OsString;
use std::fs::{self, PathExt};
@ -883,6 +885,16 @@ fn link_natively(sess: &Session, dylib: bool,
let prog = time(sess.time_passes(), "running linker", || cmd.output());
match prog {
Ok(prog) => {
fn escape_string(s: &[u8]) -> String {
str::from_utf8(s).map(|s| s.to_owned())
.unwrap_or_else(|_| {
let mut x = "Non-UTF-8 output: ".to_string();
x.extend(s.iter()
.flat_map(|&b| ascii::escape_default(b))
.map(|b| char::from_u32(b as u32).unwrap()));
x
})
}
if !prog.status.success() {
sess.err(&format!("linking with `{}` failed: {}",
pname,
@ -890,11 +902,11 @@ fn link_natively(sess: &Session, dylib: bool,
sess.note(&format!("{:?}", &cmd));
let mut output = prog.stderr.clone();
output.push_all(&prog.stdout);
sess.note(str::from_utf8(&output[..]).unwrap());
sess.note(&*escape_string(&output[..]));
sess.abort_if_errors();
}
info!("linker stderr:\n{}", String::from_utf8(prog.stderr).unwrap());
info!("linker stdout:\n{}", String::from_utf8(prog.stdout).unwrap());
info!("linker stderr:\n{}", escape_string(&prog.stderr[..]));
info!("linker stdout:\n{}", escape_string(&prog.stdout[..]));
},
Err(e) => {
sess.fatal(&format!("could not exec the linker `{}`: {}", pname, e));