Skip to content

Commit 21ee03e

Browse files
borsbors
committedDec 13, 2022
Auto merge of #105667 - matthiaskrgr:rollup-fexlc0b, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #105147 (Allow unsafe through inline const) - #105438 (Move some codegen-y methods from `rustc_hir_analysis::collect` -> `rustc_codegen_ssa`) - #105464 (Support #[track_caller] on async closures) - #105476 (Change pattern borrowing suggestions to be verbose and remove invalid suggestion) - #105500 (Make some diagnostics not depend on the source of what they reference being available) - #105628 (Small doc fixes) - #105659 (Don't require owned data in `MaybeStorageLive`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
·
1.87.01.68.0
2 parents 0f529f0 + e0e9f3a commit 21ee03e

File tree

354 files changed

+3398
-3397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

354 files changed

+3398
-3397
lines changed
 

‎compiler/rustc_ast_lowering/src/expr.rs

Lines changed: 48 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,44 @@ impl<'hir> LoweringContext<'_, 'hir> {
3131

3232
pub(super) fn lower_expr_mut(&mut self, e: &Expr) -> hir::Expr<'hir> {
3333
ensure_sufficient_stack(|| {
34+
match &e.kind {
35+
// Paranthesis expression does not have a HirId and is handled specially.
36+
ExprKind::Paren(ex) => {
37+
let mut ex = self.lower_expr_mut(ex);
38+
// Include parens in span, but only if it is a super-span.
39+
if e.span.contains(ex.span) {
40+
ex.span = self.lower_span(e.span);
41+
}
42+
// Merge attributes into the inner expression.
43+
if !e.attrs.is_empty() {
44+
let old_attrs =
45+
self.attrs.get(&ex.hir_id.local_id).map(|la| *la).unwrap_or(&[]);
46+
self.attrs.insert(
47+
ex.hir_id.local_id,
48+
&*self.arena.alloc_from_iter(
49+
e.attrs
50+
.iter()
51+
.map(|a| self.lower_attr(a))
52+
.chain(old_attrs.iter().cloned()),
53+
),
54+
);
55+
}
56+
return ex;
57+
}
58+
// Desugar `ExprForLoop`
59+
// from: `[opt_ident]: for <pat> in <head> <body>`
60+
//
61+
// This also needs special handling because the HirId of the returned `hir::Expr` will not
62+
// correspond to the `e.id`, so `lower_expr_for` handles attribute lowering itself.
63+
ExprKind::ForLoop(pat, head, body, opt_label) => {
64+
return self.lower_expr_for(e, pat, head, body, *opt_label);
65+
}
66+
_ => (),
67+
}
68+
69+
let hir_id = self.lower_node_id(e.id);
70+
self.lower_attrs(hir_id, &e.attrs);
71+
3472
let kind = match &e.kind {
3573
ExprKind::Box(inner) => hir::ExprKind::Box(self.lower_expr(inner)),
3674
ExprKind::Array(exprs) => hir::ExprKind::Array(self.lower_exprs(exprs)),
@@ -48,7 +86,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
4886
if e.attrs.get(0).map_or(false, |a| a.has_name(sym::rustc_box)) {
4987
if let [inner] = &args[..] && e.attrs.len() == 1 {
5088
let kind = hir::ExprKind::Box(self.lower_expr(&inner));
51-
let hir_id = self.lower_node_id(e.id);
5289
return hir::Expr { hir_id, kind, span: self.lower_span(e.span) };
5390
} else {
5491
self.tcx.sess.emit_err(RustcBoxAttributeError { span: e.span });
@@ -147,7 +184,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
147184
),
148185
ExprKind::Async(capture_clause, closure_node_id, block) => self.make_async_expr(
149186
*capture_clause,
150-
None,
187+
hir_id,
151188
*closure_node_id,
152189
None,
153190
e.span,
@@ -184,6 +221,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
184221
binder,
185222
*capture_clause,
186223
e.id,
224+
hir_id,
187225
*closure_id,
188226
fn_decl,
189227
body,
@@ -279,39 +317,12 @@ impl<'hir> LoweringContext<'_, 'hir> {
279317
ExprKind::Yield(opt_expr) => self.lower_expr_yield(e.span, opt_expr.as_deref()),
280318
ExprKind::Err => hir::ExprKind::Err,
281319
ExprKind::Try(sub_expr) => self.lower_expr_try(e.span, sub_expr),
282-
ExprKind::Paren(ex) => {
283-
let mut ex = self.lower_expr_mut(ex);
284-
// Include parens in span, but only if it is a super-span.
285-
if e.span.contains(ex.span) {
286-
ex.span = self.lower_span(e.span);
287-
}
288-
// Merge attributes into the inner expression.
289-
if !e.attrs.is_empty() {
290-
let old_attrs =
291-
self.attrs.get(&ex.hir_id.local_id).map(|la| *la).unwrap_or(&[]);
292-
self.attrs.insert(
293-
ex.hir_id.local_id,
294-
&*self.arena.alloc_from_iter(
295-
e.attrs
296-
.iter()
297-
.map(|a| self.lower_attr(a))
298-
.chain(old_attrs.iter().cloned()),
299-
),
300-
);
301-
}
302-
return ex;
303-
}
304320

305-
// Desugar `ExprForLoop`
306-
// from: `[opt_ident]: for <pat> in <head> <body>`
307-
ExprKind::ForLoop(pat, head, body, opt_label) => {
308-
return self.lower_expr_for(e, pat, head, body, *opt_label);
309-
}
321+
ExprKind::Paren(_) | ExprKind::ForLoop(..) => unreachable!("already handled"),
322+
310323
ExprKind::MacCall(_) => panic!("{:?} shouldn't exist here", e.span),
311324
};
312325

313-
let hir_id = self.lower_node_id(e.id);
314-
self.lower_attrs(hir_id, &e.attrs);
315326
hir::Expr { hir_id, kind, span: self.lower_span(e.span) }
316327
})
317328
}
@@ -576,7 +587,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
576587
pub(super) fn make_async_expr(
577588
&mut self,
578589
capture_clause: CaptureBy,
579-
outer_hir_id: Option<hir::HirId>,
590+
outer_hir_id: hir::HirId,
580591
closure_node_id: NodeId,
581592
ret_ty: Option<hir::FnRetTy<'hir>>,
582593
span: Span,
@@ -669,8 +680,9 @@ impl<'hir> LoweringContext<'_, 'hir> {
669680
hir::ExprKind::Closure(c)
670681
};
671682

672-
let track_caller = outer_hir_id
673-
.and_then(|id| self.attrs.get(&id.local_id))
683+
let track_caller = self
684+
.attrs
685+
.get(&outer_hir_id.local_id)
674686
.map_or(false, |attrs| attrs.into_iter().any(|attr| attr.has_name(sym::track_caller)));
675687

676688
let hir_id = self.lower_node_id(closure_node_id);
@@ -985,6 +997,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
985997
binder: &ClosureBinder,
986998
capture_clause: CaptureBy,
987999
closure_id: NodeId,
1000+
closure_hir_id: hir::HirId,
9881001
inner_closure_id: NodeId,
9891002
decl: &FnDecl,
9901003
body: &Expr,
@@ -1018,9 +1031,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
10181031

10191032
let async_body = this.make_async_expr(
10201033
capture_clause,
1021-
// FIXME(nbdd0121): This should also use a proper HIR id so `#[track_caller]`
1022-
// can be applied on async closures as well.
1023-
None,
1034+
closure_hir_id,
10241035
inner_closure_id,
10251036
async_ret_ty,
10261037
body.span,

‎compiler/rustc_ast_lowering/src/item.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1139,7 +1139,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
11391139

11401140
let async_expr = this.make_async_expr(
11411141
CaptureBy::Value,
1142-
Some(fn_id),
1142+
fn_id,
11431143
closure_id,
11441144
None,
11451145
body.span,

0 commit comments

Comments
 (0)