mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustc: Fix a borrow failure in .ln_str()

Browse Source 
`ln_str` caused ICE if `RUST_LOG=rustc::middle::liveness` is given
due to borrow failure.
This commit is contained in:
klutzy 2013-12-29 02:47:12 +09:00
parent 00d87e0d81
commit eaae0ac68a
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/librustc/middle/liveness.rs
View File

@ -789,21 +789,32 @@ impl Liveness {
str::from_utf8_owned(io::mem::with_mem_writer(|wr| {
let wr = wr as &mut io::Writer;
{
let lnks = self.ir.lnks.borrow();
let lnks = self.ir.lnks.try_borrow();
write!(wr,
"[ln({}) of kind {:?} reads",
*ln,
lnks.get()[*ln]);
lnks.and_then(|lnks| Some(lnks.get()[*ln])));
}
let users = self.users.try_borrow();
match users {
Some(users) => {
self.write_vars(wr, ln, |idx| users.get()[idx].reader);
write!(wr, " writes");
self.write_vars(wr, ln, |idx| users.get()[idx].writer);
}
None => {
write!(wr, " (users borrowed)");
}
}
let successors = self.successors.try_borrow();
match successors {
Some(successors) => {
write!(wr, " precedes {}]", successors.get()[*ln].to_str());
}
None => {
write!(wr, " precedes (successors borrowed)]");
}
}
let users = self.users.borrow();
self.write_vars(wr, ln, |idx| users.get()[idx].reader);
write!(wr, " writes");
self.write_vars(wr, ln, |idx| users.get()[idx].writer);
let successor = {
let successors = self.successors.borrow();
successors.get()[*ln]
};
write!(wr, " precedes {}]", successor.to_str());
}))
}