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

Fix a soundness bug in with_tables.

Browse Source 
We were able to uplift any value from `Tables` to `'static`, which is unsound.
This commit is contained in:
Oli Scherer 2024-01-19 09:42:30 +00:00
parent 16fadb3f25
commit 06a9dbe5e8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_smir/src/rustc_internal/mod.rs
View File

@ -162,12 +162,12 @@ where
/// Loads the current context and calls a function with it. /// Loads the current context and calls a function with it.
/// Do not nest these, as that will ICE. /// Do not nest these, as that will ICE.
pub(crate) fn with_tables<'tcx, R>(f: impl FnOnce(&mut Tables<'tcx>) -> R) -> R { pub(crate) fn with_tables<R>(f: impl for<'tcx> FnOnce(&mut Tables<'tcx>) -> R) -> R {
assert!(TLV.is_set()); assert!(TLV.is_set());
TLV.with(|tlv| { TLV.with(|tlv| {
let ptr = tlv.get(); let ptr = tlv.get();
assert!(!ptr.is_null()); assert!(!ptr.is_null());
let wrapper = ptr as *const TablesWrapper<'tcx>; let wrapper = ptr as *const TablesWrapper<'_>;
let mut tables = unsafe { (*wrapper).0.borrow_mut() }; let mut tables = unsafe { (*wrapper).0.borrow_mut() };
f(&mut *tables) f(&mut *tables)
}) })