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

Prevent cyclic locks of alloc_map

Browse Source
This commit is contained in:
Oliver Scherer 2019-06-03 17:49:14 +02:00
parent 4b6f3868b3
commit 21b1bd69b0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librustc_mir/interpret/memory.rs
View File

@ -453,8 +453,11 @@ pub fn get_size_and_align(
if let Ok(alloc) = self.get(id) { if let Ok(alloc) = self.get(id) {
return Ok((Size::from_bytes(alloc.bytes.len() as u64), alloc.align)); return Ok((Size::from_bytes(alloc.bytes.len() as u64), alloc.align));
} }
// can't do this in the match argument, we may get cycle errors since the lock would get
// dropped after the match.
let alloc = self.tcx.alloc_map.lock().get(id);
// Could also be a fn ptr or extern static // Could also be a fn ptr or extern static
match self.tcx.alloc_map.lock().get(id) { match alloc {
Some(GlobalAlloc::Function(..)) => Ok((Size::ZERO, Align::from_bytes(1).unwrap())), Some(GlobalAlloc::Function(..)) => Ok((Size::ZERO, Align::from_bytes(1).unwrap())),
// `self.get` would also work, but can cause cycles if a static refers to itself // `self.get` would also work, but can cause cycles if a static refers to itself
Some(GlobalAlloc::Static(did)) => { Some(GlobalAlloc::Static(did)) => {