bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #136201 - davidv1992:eliminate-field-offset-alt, r=Mark-Simulacrum

Browse source 
Removed dependency on the field-offset crate, alternate approach

This is an alternate approach to reach the same goals as #136003. As it touches the core of the query system, this too probably should be evaluated for performance.

r? ``@Mark-Simulacrum``
This commit is contained in:
Jubilee 2025-02-10 00:51:50 -08:00 • committed by GitHub
commit ae732f3f65
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 20 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_middle/Cargo.toml
View file

@ -7,7 +7,6 @@ edition = "2021"
# tidy-alphabetical-start
bitflags = "2.4.1"
either = "1.5.0"
field-offset = "0.3.5"
gsgdt = "0.1.2"
polonius-engine = "0.13.0"
rustc-rayon-core = { version = "0.5.0" }

7
compiler/rustc_middle/src/query/plumbing.rs
View file

@ -1,6 +1,5 @@
use std::ops::Deref;
use field_offset::FieldOffset;
use rustc_data_structures::sync::{AtomicU64, WorkerLocal};
use rustc_hir::def_id::{DefId, LocalDefId};
use rustc_hir::hir_id::OwnerId;
@ -24,8 +23,10 @@ pub struct DynamicQuery<'tcx, C: QueryCache> {
pub eval_always: bool,
pub dep_kind: DepKind,
pub handle_cycle_error: HandleCycleError,
pub query_state: FieldOffset<QueryStates<'tcx>, QueryState<C::Key>>,
pub query_cache: FieldOffset<QueryCaches<'tcx>, C>,
// Offset of this query's state field in the QueryStates struct
pub query_state: usize,
// Offset of this query's cache field in the QueryCaches struct
pub query_cache: usize,
pub cache_on_disk: fn(tcx: TyCtxt<'tcx>, key: &C::Key) -> bool,
pub execute_query: fn(tcx: TyCtxt<'tcx>, k: C::Key) -> C::Value,
pub compute: fn(tcx: TyCtxt<'tcx>, key: C::Key) -> C::Value,