Skip to content

Commit 0f573a0

Browse files
borsbors
committed
Auto merge of rust-lang#95573 - cjgillot:lower-query, r=michaelwoerister
Make lowering a query Split from rust-lang#88186. This PR refactors the relationship between lowering and the resolver outputs in order to make lowering itself a query. In a first part, lowering is changed to avoid modifying resolver outputs, by maintaining its own data structures for creating new `NodeId`s and so. Then, the `TyCtxt` is modified to allow creating new `LocalDefId`s from inside it. This is done by: - enclosing `Definitions` in a lock, so as to allow modification; - creating a query `register_def` whose purpose is to declare a `LocalDefId` to the query system. See `TyCtxt::create_def` and `TyCtxt::iter_local_def_id` for more detailed explanations of the design.
2 parents 3e51277 + 32a30ca commit 0f573a0

File tree

37 files changed

+465
-394
lines changed

37 files changed

+465
-394
lines changed

Diff for: ‎Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -3869,6 +3869,7 @@ name = "rustc_hir"
38693869
version = "0.0.0"
38703870
dependencies = [
38713871
"odht",
3872+
"rustc_arena",
38723873
"rustc_ast",
38733874
"rustc_data_structures",
38743875
"rustc_error_messages",

Diff for: ‎compiler/rustc_ast_lowering/src/asm.rs

+31-23
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,16 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
2424
) -> &'hir hir::InlineAsm<'hir> {
2525
// Rustdoc needs to support asm! from foreign architectures: don't try
2626
// lowering the register constraints in this case.
27-
let asm_arch = if self.sess.opts.actually_rustdoc { None } else { self.sess.asm_arch };
28-
if asm_arch.is_none() && !self.sess.opts.actually_rustdoc {
29-
struct_span_err!(self.sess, sp, E0472, "inline assembly is unsupported on this target")
30-
.emit();
27+
let asm_arch =
28+
if self.tcx.sess.opts.actually_rustdoc { None } else { self.tcx.sess.asm_arch };
29+
if asm_arch.is_none() && !self.tcx.sess.opts.actually_rustdoc {
30+
struct_span_err!(
31+
self.tcx.sess,
32+
sp,
33+
E0472,
34+
"inline assembly is unsupported on this target"
35+
)
36+
.emit();
3137
}
3238
if let Some(asm_arch) = asm_arch {
3339
// Inline assembly is currently only stable for these architectures.
@@ -40,9 +46,9 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
4046
| asm::InlineAsmArch::RiscV32
4147
| asm::InlineAsmArch::RiscV64
4248
);
43-
if !is_stable && !self.sess.features_untracked().asm_experimental_arch {
49+
if !is_stable && !self.tcx.features().asm_experimental_arch {
4450
feature_err(
45-
&self.sess.parse_sess,
51+
&self.tcx.sess.parse_sess,
4652
sym::asm_experimental_arch,
4753
sp,
4854
"inline assembly is not stable yet on this architecture",
@@ -52,17 +58,16 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
5258
}
5359
if asm.options.contains(InlineAsmOptions::ATT_SYNTAX)
5460
&& !matches!(asm_arch, Some(asm::InlineAsmArch::X86 | asm::InlineAsmArch::X86_64))
55-
&& !self.sess.opts.actually_rustdoc
61+
&& !self.tcx.sess.opts.actually_rustdoc
5662
{
57-
self.sess
63+
self.tcx
64+
.sess
5865
.struct_span_err(sp, "the `att_syntax` option is only supported on x86")
5966
.emit();
6067
}
61-
if asm.options.contains(InlineAsmOptions::MAY_UNWIND)
62-
&& !self.sess.features_untracked().asm_unwind
63-
{
68+
if asm.options.contains(InlineAsmOptions::MAY_UNWIND) && !self.tcx.features().asm_unwind {
6469
feature_err(
65-
&self.sess.parse_sess,
70+
&self.tcx.sess.parse_sess,
6671
sym::asm_unwind,
6772
sp,
6873
"the `may_unwind` option is unstable",
@@ -73,20 +78,20 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
7378
let mut clobber_abis = FxHashMap::default();
7479
if let Some(asm_arch) = asm_arch {
7580
for (abi_name, abi_span) in &asm.clobber_abis {
76-
match asm::InlineAsmClobberAbi::parse(asm_arch, &self.sess.target, *abi_name) {
81+
match asm::InlineAsmClobberAbi::parse(asm_arch, &self.tcx.sess.target, *abi_name) {
7782
Ok(abi) => {
7883
// If the abi was already in the list, emit an error
7984
match clobber_abis.get(&abi) {
8085
Some((prev_name, prev_sp)) => {
81-
let mut err = self.sess.struct_span_err(
86+
let mut err = self.tcx.sess.struct_span_err(
8287
*abi_span,
8388
&format!("`{}` ABI specified multiple times", prev_name),
8489
);
8590
err.span_label(*prev_sp, "previously specified here");
8691

8792
// Multiple different abi names may actually be the same ABI
8893
// If the specified ABIs are not the same name, alert the user that they resolve to the same ABI
89-
let source_map = self.sess.source_map();
94+
let source_map = self.tcx.sess.source_map();
9095
if source_map.span_to_snippet(*prev_sp)
9196
!= source_map.span_to_snippet(*abi_span)
9297
{
@@ -101,16 +106,19 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
101106
}
102107
}
103108
Err(&[]) => {
104-
self.sess
109+
self.tcx
110+
.sess
105111
.struct_span_err(
106112
*abi_span,
107113
"`clobber_abi` is not supported on this target",
108114
)
109115
.emit();
110116
}
111117
Err(supported_abis) => {
112-
let mut err =
113-
self.sess.struct_span_err(*abi_span, "invalid ABI for `clobber_abi`");
118+
let mut err = self
119+
.tcx
120+
.sess
121+
.struct_span_err(*abi_span, "invalid ABI for `clobber_abi`");
114122
let mut abis = format!("`{}`", supported_abis[0]);
115123
for m in &supported_abis[1..] {
116124
let _ = write!(abis, ", `{}`", m);
@@ -128,7 +136,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
128136
// Lower operands to HIR. We use dummy register classes if an error
129137
// occurs during lowering because we still need to be able to produce a
130138
// valid HIR.
131-
let sess = self.sess;
139+
let sess = self.tcx.sess;
132140
let mut operands: Vec<_> = asm
133141
.operands
134142
.iter()
@@ -184,9 +192,9 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
184192
}
185193
}
186194
InlineAsmOperand::Const { ref anon_const } => {
187-
if !self.sess.features_untracked().asm_const {
195+
if !self.tcx.features().asm_const {
188196
feature_err(
189-
&self.sess.parse_sess,
197+
&sess.parse_sess,
190198
sym::asm_const,
191199
*op_sp,
192200
"const operands for inline assembly are unstable",
@@ -198,9 +206,9 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
198206
}
199207
}
200208
InlineAsmOperand::Sym { ref sym } => {
201-
if !self.sess.features_untracked().asm_sym {
209+
if !self.tcx.features().asm_sym {
202210
feature_err(
203-
&self.sess.parse_sess,
211+
&sess.parse_sess,
204212
sym::asm_sym,
205213
*op_sp,
206214
"sym operands for inline assembly are unstable",

Diff for: ‎compiler/rustc_ast_lowering/src/block.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
159159
span,
160160
kind: hir::ExprKind::If(let_expr, then_expr, Some(else_expr)),
161161
});
162-
if !self.sess.features_untracked().let_else {
162+
if !self.tcx.features().let_else {
163163
feature_err(
164-
&self.sess.parse_sess,
164+
&self.tcx.sess.parse_sess,
165165
sym::let_else,
166166
local.span,
167167
"`let...else` statements are unstable",

Diff for: ‎compiler/rustc_ast_lowering/src/expr.rs

+20-13
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
4646
let hir_id = self.lower_node_id(e.id);
4747
return hir::Expr { hir_id, kind, span: self.lower_span(e.span) };
4848
} else {
49-
self.sess
49+
self.tcx.sess
5050
.struct_span_err(
5151
e.span,
5252
"#[rustc_box] requires precisely one argument \
@@ -207,8 +207,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
207207
self.lower_expr_range(e.span, e1.as_deref(), e2.as_deref(), lims)
208208
}
209209
ExprKind::Underscore => {
210-
self.sess
211-
.struct_span_err(
210+
self.tcx
211+
.sess.struct_span_err(
212212
e.span,
213213
"in expressions, `_` can only be used on the left-hand side of an assignment",
214214
)
@@ -245,7 +245,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
245245
let rest = match &se.rest {
246246
StructRest::Base(e) => Some(self.lower_expr(e)),
247247
StructRest::Rest(sp) => {
248-
self.sess
248+
self.tcx
249+
.sess
249250
.struct_span_err(*sp, "base expression required after `..`")
250251
.span_label(*sp, "add a base expression here")
251252
.emit();
@@ -474,7 +475,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
474475
} else {
475476
let try_span = this.mark_span_with_reason(
476477
DesugaringKind::TryBlock,
477-
this.sess.source_map().end_point(body.span),
478+
this.tcx.sess.source_map().end_point(body.span),
478479
this.allow_try_trait.clone(),
479480
);
480481

@@ -653,7 +654,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
653654
Some(hir::GeneratorKind::Async(_)) => {}
654655
Some(hir::GeneratorKind::Gen) | None => {
655656
let mut err = struct_span_err!(
656-
self.sess,
657+
self.tcx.sess,
657658
dot_await_span,
658659
E0728,
659660
"`await` is only allowed inside `async` functions and blocks"
@@ -878,7 +879,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
878879
Some(hir::GeneratorKind::Gen) => {
879880
if decl.inputs.len() > 1 {
880881
struct_span_err!(
881-
self.sess,
882+
self.tcx.sess,
882883
fn_decl_span,
883884
E0628,
884885
"too many parameters for a generator (expected 0 or 1 parameters)"
@@ -892,8 +893,13 @@ impl<'hir> LoweringContext<'_, 'hir> {
892893
}
893894
None => {
894895
if movability == Movability::Static {
895-
struct_span_err!(self.sess, fn_decl_span, E0697, "closures cannot be static")
896-
.emit();
896+
struct_span_err!(
897+
self.tcx.sess,
898+
fn_decl_span,
899+
E0697,
900+
"closures cannot be static"
901+
)
902+
.emit();
897903
}
898904
None
899905
}
@@ -916,7 +922,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
916922
// FIXME(cramertj): allow `async` non-`move` closures with arguments.
917923
if capture_clause == CaptureBy::Ref && !decl.inputs.is_empty() {
918924
struct_span_err!(
919-
this.sess,
925+
this.tcx.sess,
920926
fn_decl_span,
921927
E0708,
922928
"`async` non-`move` closures with parameters are not currently supported",
@@ -1163,7 +1169,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
11631169
);
11641170
let fields_omitted = match &se.rest {
11651171
StructRest::Base(e) => {
1166-
self.sess
1172+
self.tcx
1173+
.sess
11671174
.struct_span_err(
11681175
e.span,
11691176
"functional record updates are not allowed in destructuring \
@@ -1371,7 +1378,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
13711378
Some(hir::GeneratorKind::Gen) => {}
13721379
Some(hir::GeneratorKind::Async(_)) => {
13731380
struct_span_err!(
1374-
self.sess,
1381+
self.tcx.sess,
13751382
span,
13761383
E0727,
13771384
"`async` generators are not yet supported"
@@ -1516,7 +1523,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
15161523
span,
15171524
self.allow_try_trait.clone(),
15181525
);
1519-
let try_span = self.sess.source_map().end_point(span);
1526+
let try_span = self.tcx.sess.source_map().end_point(span);
15201527
let try_span = self.mark_span_with_reason(
15211528
DesugaringKind::QuestionMark,
15221529
try_span,

Diff for: ‎compiler/rustc_ast_lowering/src/item.rs

+7-23
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use super::ResolverAstLoweringExt;
22
use super::{AstOwner, ImplTraitContext, ImplTraitPosition};
3-
use super::{LoweringContext, ParamMode};
4-
use crate::{Arena, FnDeclKind};
3+
use super::{FnDeclKind, LoweringContext, ParamMode};
54

65
use rustc_ast::ptr::P;
76
use rustc_ast::visit::AssocCtxt;
@@ -12,12 +11,9 @@ use rustc_errors::struct_span_err;
1211
use rustc_hir as hir;
1312
use rustc_hir::def::{DefKind, Res};
1413
use rustc_hir::def_id::{LocalDefId, CRATE_DEF_ID};
15-
use rustc_hir::definitions::Definitions;
1614
use rustc_hir::PredicateOrigin;
1715
use rustc_index::vec::{Idx, IndexVec};
18-
use rustc_middle::ty::{ResolverAstLowering, ResolverOutputs};
19-
use rustc_session::cstore::CrateStoreDyn;
20-
use rustc_session::Session;
16+
use rustc_middle::ty::{DefIdTree, ResolverAstLowering, TyCtxt};
2117
use rustc_span::source_map::DesugaringKind;
2218
use rustc_span::symbol::{kw, sym, Ident};
2319
use rustc_span::Span;
@@ -27,12 +23,8 @@ use smallvec::{smallvec, SmallVec};
2723
use std::iter;
2824

2925
pub(super) struct ItemLowerer<'a, 'hir> {
30-
pub(super) sess: &'a Session,
31-
pub(super) definitions: &'a mut Definitions,
32-
pub(super) cstore: &'a CrateStoreDyn,
33-
pub(super) resolutions: &'a ResolverOutputs,
26+
pub(super) tcx: TyCtxt<'hir>,
3427
pub(super) resolver: &'a mut ResolverAstLowering,
35-
pub(super) arena: &'hir Arena<'hir>,
3628
pub(super) ast_index: &'a IndexVec<LocalDefId, AstOwner<'a>>,
3729
pub(super) owners: &'a mut IndexVec<LocalDefId, hir::MaybeOwner<&'hir hir::OwnerInfo<'hir>>>,
3830
}
@@ -65,12 +57,9 @@ impl<'a, 'hir> ItemLowerer<'a, 'hir> {
6557
) {
6658
let mut lctx = LoweringContext {
6759
// Pseudo-globals.
68-
sess: &self.sess,
69-
definitions: self.definitions,
70-
cstore: self.cstore,
71-
resolutions: self.resolutions,
60+
tcx: self.tcx,
7261
resolver: self.resolver,
73-
arena: self.arena,
62+
arena: self.tcx.hir_arena,
7463

7564
// HirId handling.
7665
bodies: Vec::new(),
@@ -144,12 +133,7 @@ impl<'a, 'hir> ItemLowerer<'a, 'hir> {
144133
fn lower_assoc_item(&mut self, item: &AssocItem, ctxt: AssocCtxt) {
145134
let def_id = self.resolver.node_id_to_def_id[&item.id];
146135

147-
let parent_id = {
148-
let parent = self.definitions.def_key(def_id).parent;
149-
let local_def_index = parent.unwrap();
150-
LocalDefId { local_def_index }
151-
};
152-
136+
let parent_id = self.tcx.local_parent(def_id);
153137
let parent_hir = self.lower_node(parent_id).unwrap();
154138
self.with_lctx(item.id, |lctx| {
155139
// Evaluate with the lifetimes in `params` in-scope.
@@ -1278,7 +1262,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
12781262
}
12791263

12801264
fn error_on_invalid_abi(&self, abi: StrLit) {
1281-
struct_span_err!(self.sess, abi.span, E0703, "invalid ABI: found `{}`", abi.symbol)
1265+
struct_span_err!(self.tcx.sess, abi.span, E0703, "invalid ABI: found `{}`", abi.symbol)
12821266
.span_label(abi.span, "invalid ABI")
12831267
.help(&format!("valid ABIs: {}", abi::all_names().join(", ")))
12841268
.emit();

0 commit comments

Comments
 (0)