nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-29 10:13:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix recursion depth counting in layout

Browse Source
This commit is contained in:
James Miller 2017-02-08 22:23:09 +13:00 committed by Eduard-Mihai Burtescu
parent d708a4072a
commit 540b52e145
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librustc/ty/util.rs
View File

@ -654,11 +654,12 @@ impl<'a, 'tcx> ty::TyS<'tcx> {
} }
tcx.layout_depth.set(depth+1); tcx.layout_depth.set(depth+1);
let layout = Layout::compute_uncached(self, infcx)?; let layout = Layout::compute_uncached(self, infcx);
tcx.layout_depth.set(depth);
let layout = layout?;
if can_cache { if can_cache {
tcx.layout_cache.borrow_mut().insert(self, layout); tcx.layout_cache.borrow_mut().insert(self, layout);
} }
tcx.layout_depth.set(depth);
Ok(layout) Ok(layout)
} }