bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use scoped-tls for SMIR to map between TyCtxt and SMIR datastructures

Browse source
This commit is contained in:
yukang 2023-07-02 07:48:41 +08:00
parent 56d507dc92
commit 361df86a8d
4 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock
View file

@ -4022,6 +4022,7 @@ dependencies = [
"rustc_hir", "rustc_hir",
"rustc_middle", "rustc_middle",
"rustc_span", "rustc_span",
"scoped-tls",
"tracing", "tracing",
] ]

1
compiler/rustc_smir/Cargo.toml
View file

@ -8,6 +8,7 @@ rustc_hir = { path = "../rustc_hir" }
rustc_middle = { path = "../rustc_middle", optional = true } rustc_middle = { path = "../rustc_middle", optional = true }
rustc_span = { path = "../rustc_span", optional = true } rustc_span = { path = "../rustc_span", optional = true }
tracing = "0.1" tracing = "0.1"
scoped-tls = "1.0"
[features] [features]
default = [ default = [

3
compiler/rustc_smir/src/lib.rs
View file

@ -19,3 +19,6 @@ pub mod stable_mir;
// Make this module private for now since external users should not call these directly. // Make this module private for now since external users should not call these directly.
mod rustc_smir; mod rustc_smir;
#[macro_use]
extern crate scoped_tls;

24
compiler/rustc_smir/src/stable_mir/mod.rs
View file

@ -100,18 +100,17 @@ pub trait Context {
fn rustc_tables(&mut self, f: &mut dyn FnMut(&mut Tables<'_>)); fn rustc_tables(&mut self, f: &mut dyn FnMut(&mut Tables<'_>));
} }
thread_local! { // A thread local variable that stores a pointer to the tables mapping between TyCtxt
/// A thread local variable that stores a pointer to the tables mapping between TyCtxt // datastructures and stable MIR datastructures
/// datastructures and stable MIR datastructures. scoped_thread_local! (static TLV: Cell<*mut ()>);
static TLV: Cell<*mut ()> = const { Cell::new(std::ptr::null_mut()) };
}
pub fn run(mut context: impl Context, f: impl FnOnce()) { pub fn run(mut context: impl Context, f: impl FnOnce()) {
assert!(TLV.get().is_null()); assert!(!TLV.is_set());
fn g<'a>(mut context: &mut (dyn Context + 'a), f: impl FnOnce()) { fn g<'a>(mut context: &mut (dyn Context + 'a), f: impl FnOnce()) {
TLV.set(&mut context as *mut &mut _ as _); let ptr: *mut () = &mut context as *mut &mut _ as _;
TLV.set(&Cell::new(ptr), || {
f(); f();
TLV.replace(std::ptr::null_mut()); });
} }
g(&mut context, f); g(&mut context, f);
} }
@ -119,9 +118,10 @@ pub fn run(mut context: impl Context, f: impl FnOnce()) {
/// 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<R>(f: impl FnOnce(&mut dyn Context) -> R) -> R { pub(crate) fn with<R>(f: impl FnOnce(&mut dyn Context) -> R) -> R {
let ptr = TLV.replace(std::ptr::null_mut()) as *mut &mut dyn Context; assert!(TLV.is_set());
TLV.with(|tlv| {
let ptr = tlv.get();
assert!(!ptr.is_null()); assert!(!ptr.is_null());
let ret = f(unsafe { *ptr }); f(unsafe { *(ptr as *mut &mut dyn Context) })
TLV.set(ptr as _); })
ret
} }