mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
rust/compiler/rustc_middle/src/arena.rs

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

111 lines
6.0 KiB
Rust
Raw Normal View History

Add some comments. Also use `Default::default()` in one `TypedArena::default()`, for consistency with `DroplessArena::default()`.
2021-11-16 09:49:15 +11:00
/// This higher-order macro declares a list of types which can be allocated by `Arena`.
Add a comment for arena_types!
2019-05-19 17:27:28 +02:00
///
fix rustdoc warnings
2020-05-01 22:28:15 +02:00
/// Specifying the `decode` modifier will add decode impls for `&T` and `&[T]` where `T` is the type
Add a comment for arena_types!
2019-05-19 17:27:28 +02:00
/// listed. These impls will appear in the implement_ty_decoder! macro.
Introduce an arena type which may be used to allocate a list of types with destructors
2019-03-29 17:49:11 +01:00
#[macro_export]
macro_rules! arena_types {
Remove unnecessary lifetime argument from arena macros. Because it's always `'tcx`. In fact, some of them use a mixture of passed-in `$tcx` and hard-coded `'tcx`, so no other lifetime would even work. This makes the code easier to read.
2021-11-16 09:28:26 +11:00
($macro:path) => (
Remove unused arena macro args
2021-08-30 13:09:38 +02:00
$macro!([
Clarify `Layout` interning. `Layout` is another type that is sometimes interned, sometimes not, and we always use references to refer to it so we can't take any advantage of the uniqueness properties for hashing or equality checks. This commit renames `Layout` as `LayoutS`, and then introduces a new `Layout` that is a newtype around an `Interned<LayoutS>`. It also interns more layouts than before. Previously layouts within layouts (via the `variants` field) were never interned, but now they are. Hence the lifetime on the new `Layout` type. Unlike other interned types, these ones are in `rustc_target` instead of `rustc_middle`. This reflects the existing structure of the code, which does layout-specific stuff in `rustc_target` while `TyAndLayout` is generic over the `Ty`, allowing the type-specific stuff to occur in `rustc_middle`. The commit also adds a `HashStable` impl for `Interned`, which was needed. It hashes the contents, unlike the `Hash` impl which hashes the pointer.
2022-03-04 13:46:56 +11:00
[] layout: rustc_target::abi::LayoutS<'tcx>,
Remove unnecessary lifetime argument from arena macros. Because it's always `'tcx`. In fact, some of them use a mixture of passed-in `$tcx` and hard-coded `'tcx`, so no other lifetime would even work. This makes the code easier to read.
2021-11-16 09:28:26 +11:00
[] fn_abi: rustc_target::abi::call::FnAbi<'tcx, rustc_middle::ty::Ty<'tcx>>,
Fix incremental compilation.
2020-04-03 09:49:21 +02:00
// AdtDef are interned and compared by address
Improve `AdtDef` interning. This commit makes `AdtDef` use `Interned`. Much the commit is tedious changes to introduce getter functions. The interesting changes are in `compiler/rustc_middle/src/ty/adt.rs`.
2022-03-05 07:28:41 +11:00
[decode] adt_def: rustc_middle::ty::AdtDefData,
Remove unnecessary lifetime argument from arena macros. Because it's always `'tcx`. In fact, some of them use a mixture of passed-in `$tcx` and hard-coded `'tcx`, so no other lifetime would even work. This makes the code easier to read.
2021-11-16 09:28:26 +11:00
[] steal_thir: rustc_data_structures::steal::Steal<rustc_middle::thir::Thir<'tcx>>,
[] steal_mir: rustc_data_structures::steal::Steal<rustc_middle::mir::Body<'tcx>>,
[decode] mir: rustc_middle::mir::Body<'tcx>,
continue mir pipeline
2020-07-03 22:15:27 +02:00
[] steal_promoted:
Move Steal to rustc_data_structures.
2020-11-14 01:29:30 +01:00
rustc_data_structures::steal::Steal<
continue mir pipeline
2020-07-03 22:15:27 +02:00
rustc_index::vec::IndexVec<
rustc_middle::mir::Promoted,
Remove unnecessary lifetime argument from arena macros. Because it's always `'tcx`. In fact, some of them use a mixture of passed-in `$tcx` and hard-coded `'tcx`, so no other lifetime would even work. This makes the code easier to read.
2021-11-16 09:28:26 +11:00
rustc_middle::mir::Body<'tcx>
continue mir pipeline
2020-07-03 22:15:27 +02:00
>
>,
decode stuff
2020-07-07 00:34:28 +02:00
[decode] promoted:
const generics work!
2020-07-06 23:49:53 +02:00
rustc_index::vec::IndexVec<
rustc_middle::mir::Promoted,
Remove unnecessary lifetime argument from arena macros. Because it's always `'tcx`. In fact, some of them use a mixture of passed-in `$tcx` and hard-coded `'tcx`, so no other lifetime would even work. This makes the code easier to read.
2021-11-16 09:28:26 +11:00
rustc_middle::mir::Body<'tcx>
const generics work!
2020-07-06 23:49:53 +02:00
>,
Remove unnecessary lifetime argument from arena macros. Because it's always `'tcx`. In fact, some of them use a mixture of passed-in `$tcx` and hard-coded `'tcx`, so no other lifetime would even work. This makes the code easier to read.
2021-11-16 09:28:26 +11:00
[decode] typeck_results: rustc_middle::ty::TypeckResults<'tcx>,
continue mir pipeline
2020-07-03 22:15:27 +02:00
[decode] borrowck_result:
Remove unnecessary lifetime argument from arena macros. Because it's always `'tcx`. In fact, some of them use a mixture of passed-in `$tcx` and hard-coded `'tcx`, so no other lifetime would even work. This makes the code easier to read.
2021-11-16 09:28:26 +11:00
rustc_middle::mir::BorrowCheckResult<'tcx>,
Simplify arena_types macros
2020-06-15 17:29:14 +01:00
[decode] unsafety_check_result: rustc_middle::mir::UnsafetyCheckResult,
Combination of commits Fixes multiple issue with counters, with simplification Includes a change to the implicit else span in ast_lowering, so coverage of the implicit else no longer spans the `then` block. Adds coverage for unused closures and async function bodies. Fixes: #78542 Adding unreachable regions for known MIR missing from coverage map Cleaned up PR commits, and removed link-dead-code requirement and tests Coverage no longer depends on Issue #76038 (`-C link-dead-code` is no longer needed or enforced, so MSVC can use the same tests as Linux and MacOS now) Restrict adding unreachable regions to covered files Improved the code that adds coverage for uncalled functions (with MIR but not-codegenned) to avoid generating coverage in files not already included in the files with covered functions. Resolved last known issue requiring --emit llvm-ir workaround Fixed bugs in how unreachable code spans were added.
2020-11-30 23:58:08 -08:00
[decode] code_region: rustc_middle::mir::coverage::CodeRegion,
Simplify arena_types macros
2020-06-15 17:29:14 +01:00
[] const_allocs: rustc_middle::mir::interpret::Allocation,
try to cache region_scope_tree as a query
2022-05-25 13:52:32 +08:00
[] region_scope_tree: rustc_middle::middle::region::ScopeTree,
Fix incremental compilation.
2020-04-03 09:49:21 +02:00
// Required for the incremental on-disk cache
Remove `DropArena`. Most arena-allocate types that impl `Drop` get their own `TypedArena`, but a few infrequently used ones share a `DropArena`. This sharing adds complexity but doesn't help performance or memory usage. Perhaps it was more effective in the past prior to some other improvements to arenas. This commit removes `DropArena` and the sharing of arenas via the `few` attribute of the `arena_types` macro. This change removes over 100 lines of code and nine uses of `unsafe` (one of which affects the parallel compiler) and makes the remaining code easier to read.
2021-11-15 17:15:42 +11:00
[] mir_keys: rustc_hir::def_id::DefIdSet,
Update trait queries
2018-11-30 23:37:18 +01:00
[] dropck_outlives:
rustc -> rustc_middle part 2
2020-03-29 16:41:09 +02:00
rustc_middle::infer::canonical::Canonical<'tcx,
rustc_middle::infer::canonical::QueryResponse<'tcx,
rustc_middle::traits::query::DropckOutlivesResult<'tcx>
Update trait queries
2018-11-30 23:37:18 +01:00
>
>,
[] normalize_projection_ty:
rustc -> rustc_middle part 2
2020-03-29 16:41:09 +02:00
rustc_middle::infer::canonical::Canonical<'tcx,
rustc_middle::infer::canonical::QueryResponse<'tcx,
rustc_middle::traits::query::NormalizationResult<'tcx>
Update trait queries
2018-11-30 23:37:18 +01:00
>
>,
[] implied_outlives_bounds:
rustc -> rustc_middle part 2
2020-03-29 16:41:09 +02:00
rustc_middle::infer::canonical::Canonical<'tcx,
rustc_middle::infer::canonical::QueryResponse<'tcx,
Vec<rustc_middle::traits::query::OutlivesBound<'tcx>>
Update trait queries
2018-11-30 23:37:18 +01:00
>
>,
Swap DtorckConstraint to DropckConstraint This change was made as per suspicion that this struct was never renamed after consistent use of DropCk. This also clarifies the meaning behind the name of this structure.
2022-03-24 19:21:41 +01:00
[] dtorck_constraint: rustc_middle::traits::query::DropckConstraint<'tcx>,
Ensure that queries only return Copy types.
2022-01-31 19:55:34 +01:00
[] candidate_step: rustc_middle::traits::query::CandidateStep<'tcx>,
[] autoderef_bad_ty: rustc_middle::traits::query::MethodAutoderefBadTy<'tcx>,
arena > Rc for query results
2022-07-12 15:21:58 +02:00
[] query_region_constraints: rustc_middle::infer::canonical::QueryRegionConstraints<'tcx>,
Update trait queries
2018-11-30 23:37:18 +01:00
[] type_op_subtype:
rustc -> rustc_middle part 2
2020-03-29 16:41:09 +02:00
rustc_middle::infer::canonical::Canonical<'tcx,
rustc_middle::infer::canonical::QueryResponse<'tcx, ()>
Update trait queries
2018-11-30 23:37:18 +01:00
>,
[] type_op_normalize_poly_fn_sig:
rustc -> rustc_middle part 2
2020-03-29 16:41:09 +02:00
rustc_middle::infer::canonical::Canonical<'tcx,
rustc_middle::infer::canonical::QueryResponse<'tcx, rustc_middle::ty::PolyFnSig<'tcx>>
Update trait queries
2018-11-30 23:37:18 +01:00
>,
[] type_op_normalize_fn_sig:
rustc -> rustc_middle part 2
2020-03-29 16:41:09 +02:00
rustc_middle::infer::canonical::Canonical<'tcx,
rustc_middle::infer::canonical::QueryResponse<'tcx, rustc_middle::ty::FnSig<'tcx>>
Update trait queries
2018-11-30 23:37:18 +01:00
>,
[] type_op_normalize_predicate:
rustc -> rustc_middle part 2
2020-03-29 16:41:09 +02:00
rustc_middle::infer::canonical::Canonical<'tcx,
rustc_middle::infer::canonical::QueryResponse<'tcx, rustc_middle::ty::Predicate<'tcx>>
Update trait queries
2018-11-30 23:37:18 +01:00
>,
[] type_op_normalize_ty:
rustc -> rustc_middle part 2
2020-03-29 16:41:09 +02:00
rustc_middle::infer::canonical::Canonical<'tcx,
rustc_middle::infer::canonical::QueryResponse<'tcx, rustc_middle::ty::Ty<'tcx>>
Update trait queries
2018-11-30 23:37:18 +01:00
>,
Remove `DropArena`. Most arena-allocate types that impl `Drop` get their own `TypedArena`, but a few infrequently used ones share a `DropArena`. This sharing adds complexity but doesn't help performance or memory usage. Perhaps it was more effective in the past prior to some other improvements to arenas. This commit removes `DropArena` and the sharing of arenas via the `few` attribute of the `arena_types` macro. This change removes over 100 lines of code and nine uses of `unsafe` (one of which affects the parallel compiler) and makes the remaining code easier to read.
2021-11-15 17:15:42 +11:00
[] all_traits: Vec<rustc_hir::def_id::DefId>,
[] privacy_access_levels: rustc_middle::middle::privacy::AccessLevels,
[] foreign_module: rustc_session::cstore::ForeignModule,
[] foreign_modules: Vec<rustc_session::cstore::ForeignModule>,
Simplify arena_types macros
2020-06-15 17:29:14 +01:00
[] upvars_mentioned: rustc_data_structures::fx::FxIndexMap<rustc_hir::HirId, rustc_hir::Upvar>,
[] object_safety_violations: rustc_middle::traits::ObjectSafetyViolation,
Remove unnecessary lifetime argument from arena macros. Because it's always `'tcx`. In fact, some of them use a mixture of passed-in `$tcx` and hard-coded `'tcx`, so no other lifetime would even work. This makes the code easier to read.
2021-11-16 09:28:26 +11:00
[] codegen_unit: rustc_middle::mir::mono::CodegenUnit<'tcx>,
Cache more queries on disk.
2022-03-28 19:53:01 +02:00
[decode] attribute: rustc_ast::Attribute,
Simplify arena_types macros
2020-06-15 17:29:14 +01:00
[] name_set: rustc_data_structures::fx::FxHashSet<rustc_span::symbol::Symbol>,
[] hir_id_set: rustc_hir::HirIdSet,
Nits.
2019-12-01 17:33:31 +01:00
Use Arena for interning
2020-01-02 01:26:18 +01:00
// Interned types
Document and rename the new wrapper type
2022-04-05 16:42:47 +00:00
[] tys: rustc_data_structures::intern::WithStableHash<rustc_middle::ty::TyS<'tcx>>,
Overhaul `PredicateInner` and `Predicate`. Specifically, change `Ty` from this: ``` pub struct Predicate<'tcx> { inner: &'tcx PredicateInner<'tcx> } ``` to this: ``` pub struct Predicate<'tcx>(&'tcx Interned<PredicateS<'tcx>>) ``` where `PredicateInner` is renamed as `PredicateS`. This (plus a few other minor changes) makes the parallels with `Ty` and `TyS` much clearer, and makes the uniqueness more explicit.
2022-01-27 17:00:16 +11:00
[] predicates: rustc_middle::ty::PredicateS<'tcx>,
Overhaul `Const`. Specifically, rename the `Const` struct as `ConstS` and re-introduce `Const` as this: ``` pub struct Const<'tcx>(&'tcx Interned<ConstS>); ``` This now matches `Ty` and `Predicate` more closely, including using pointer-based `eq` and `hash`. Notable changes: - `mk_const` now takes a `ConstS`. - `Const` was copy, despite being 48 bytes. Now `ConstS` is not, so need a we need separate arena for it, because we can't use the `Dropless` one any more. - Many `&'tcx Const<'tcx>`/`&Const<'tcx>` to `Const<'tcx>` changes - Many `ct.ty` to `ct.ty()` and `ct.val` to `ct.val()` changes. - Lots of tedious sigil fiddling.
2022-02-02 14:24:45 +11:00
[] consts: rustc_middle::ty::ConstS<'tcx>,
Use Arena for interning
2020-01-02 01:26:18 +01:00
Add missing ASM arena declaration to librustc_middle Fixes #72386 This type also needs to get allocated on the `librustc_middle` arena when we deserialize MIR.
2020-05-20 17:39:19 -04:00
// Note that this deliberately duplicates items in the `rustc_hir::arena`,
// since we need to allocate this type on both the `rustc_hir` arena
// (during lowering) and the `librustc_middle` arena (for decoding MIR)
rust_ast::ast => rustc_ast
2020-04-27 23:26:11 +05:30
[decode] asm_template: rustc_ast::InlineAsmTemplatePiece,
Simplify arena_types macros
2020-06-15 17:29:14 +01:00
[decode] used_trait_imports: rustc_data_structures::fx::FxHashSet<rustc_hir::def_id::LocalDefId>,
Return a FxIndexSet in is_late_bound query. This return value is iterated upon by borrowck, hence the need to preserve a deterministic iteration order.
2022-07-05 21:54:38 +02:00
[decode] is_late_bound_map: rustc_data_structures::fx::FxIndexSet<rustc_hir::def_id::LocalDefId>,
Ensure that queries only return Copy types.
2022-01-31 19:55:34 +01:00
[decode] impl_source: rustc_middle::traits::ImplSource<'tcx, ()>,
Build jump table at runtime.
2021-10-16 21:12:34 +02:00
Don't create two new closures for each query - Parameterize DepKindStruct over `'tcx` This allows passing in an invariant function pointer in `query_callback`, rather than having to try and make it work for any lifetime. - Add a new `execute_query` function to `QueryDescription` so we can call `tcx.$name` without needing to be in a macro context
2022-08-29 10:20:14 -05:00
[] dep_kind: rustc_middle::dep_graph::DepKindStruct<'tcx>,
Deeply check that method signatures match, and allow for nested RPITITs
2022-09-02 21:02:59 +00:00
[] trait_impl_trait_tys: rustc_data_structures::fx::FxHashMap<rustc_hir::def_id::DefId, rustc_middle::ty::Ty<'tcx>>,
Remove unnecessary lifetime argument from arena macros. Because it's always `'tcx`. In fact, some of them use a mixture of passed-in `$tcx` and hard-coded `'tcx`, so no other lifetime would even work. This makes the code easier to read.
2021-11-16 09:28:26 +11:00
]);
Introduce an arena type which may be used to allocate a list of types with destructors
2019-03-29 17:49:11 +01:00
)
}
Remove unnecessary lifetime argument from arena macros. Because it's always `'tcx`. In fact, some of them use a mixture of passed-in `$tcx` and hard-coded `'tcx`, so no other lifetime would even work. This makes the code easier to read.
2021-11-16 09:28:26 +11:00
arena_types!(rustc_arena::declare_arena);
Reference in New Issue Copy Permalink