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

async-llvm(7): Clean up error handling a bit.

Browse Source
This commit is contained in:
Michael Woerister 2017-07-24 16:18:11 +02:00
parent 8f6894e177
commit 4282dd87ea
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/librustc_trans/back/write.rs
View File

@ -1248,7 +1248,13 @@ fn start_executing_work(sess: &Session,
// this to spawn a new unit of work, or it may get dropped
// immediately if we have no more work to spawn.
Message::Token(token) => {
tokens.push(token.expect("failed to acquire jobserver token"));
if let Ok(token) = token {
tokens.push(token);
} else {
shared_emitter.fatal("failed to acquire jobserver token");
drop(trans_worker_send.send(Message::CheckErrorMessages));
return
}
}
Message::WorkItem(work_item) => {
@ -1266,11 +1272,12 @@ fn start_executing_work(sess: &Session,
Message::Done { success: true } => {
drop(tokens.pop());
running -= 1;
trans_worker_send.send(Message::CheckErrorMessages).unwrap();
drop(trans_worker_send.send(Message::CheckErrorMessages));
}
Message::Done { success: false } => {
shared_emitter.fatal("aborting due to worker thread panic".to_string());
trans_worker_send.send(Message::CheckErrorMessages).unwrap();
shared_emitter.fatal("aborting due to worker thread panic");
drop(trans_worker_send.send(Message::CheckErrorMessages));
return
}
msg @ Message::CheckErrorMessages => {
bug!("unexpected message: {:?}", msg);
@ -1440,8 +1447,8 @@ impl SharedEmitter {
drop(self.sender.send(SharedEmitterMessage::InlineAsmError(cookie, msg)));
}
fn fatal(&self, msg: String) {
drop(self.sender.send(SharedEmitterMessage::Fatal(msg)));
fn fatal(&self, msg: &str) {
drop(self.sender.send(SharedEmitterMessage::Fatal(msg.to_string())));
}
}