Skip to content

Commit c0e58c3

Browse files
compiler-errorscompiler-errors
committed
Add ErrorGuaranteed to HIR ExprKind::Err
1 parent a772a6f commit c0e58c3

File tree

14 files changed

+50
-33
lines changed

14 files changed

+50
-33
lines changed

‎compiler/rustc_ast_lowering/src/expr.rs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
8888
let kind = hir::ExprKind::Box(self.lower_expr(&inner));
8989
return hir::Expr { hir_id, kind, span: self.lower_span(e.span) };
9090
} else {
91-
self.tcx.sess.emit_err(RustcBoxAttributeError { span: e.span });
92-
hir::ExprKind::Err
91+
let guar = self.tcx.sess.emit_err(RustcBoxAttributeError { span: e.span });
92+
hir::ExprKind::Err(guar)
9393
}
9494
} else if let Some(legacy_args) = self.resolver.legacy_const_generic_args(f) {
9595
self.lower_legacy_const_generics((**f).clone(), args.clone(), &legacy_args)
@@ -266,8 +266,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
266266
self.lower_expr_range(e.span, e1.as_deref(), e2.as_deref(), *lims)
267267
}
268268
ExprKind::Underscore => {
269-
self.tcx.sess.emit_err(UnderscoreExprLhsAssign { span: e.span });
270-
hir::ExprKind::Err
269+
let guar = self.tcx.sess.emit_err(UnderscoreExprLhsAssign { span: e.span });
270+
hir::ExprKind::Err(guar)
271271
}
272272
ExprKind::Path(qself, path) => {
273273
let qpath = self.lower_qpath(
@@ -299,8 +299,9 @@ impl<'hir> LoweringContext<'_, 'hir> {
299299
let rest = match &se.rest {
300300
StructRest::Base(e) => Some(self.lower_expr(e)),
301301
StructRest::Rest(sp) => {
302-
self.tcx.sess.emit_err(BaseExpressionDoubleDot { span: *sp });
303-
Some(&*self.arena.alloc(self.expr_err(*sp)))
302+
let guar =
303+
self.tcx.sess.emit_err(BaseExpressionDoubleDot { span: *sp });
304+
Some(&*self.arena.alloc(self.expr_err(*sp, guar)))
304305
}
305306
StructRest::None => None,
306307
};
@@ -318,7 +319,9 @@ impl<'hir> LoweringContext<'_, 'hir> {
318319
)
319320
}
320321
ExprKind::Yield(opt_expr) => self.lower_expr_yield(e.span, opt_expr.as_deref()),
321-
ExprKind::Err => hir::ExprKind::Err,
322+
ExprKind::Err => hir::ExprKind::Err(
323+
self.tcx.sess.delay_span_bug(e.span, "lowered ExprKind::Err"),
324+
),
322325
ExprKind::Try(sub_expr) => self.lower_expr_try(e.span, sub_expr),
323326

324327
ExprKind::Paren(_) | ExprKind::ForLoop(..) => unreachable!("already handled"),
@@ -761,7 +764,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
761764
self.expr_ident_mut(span, task_context_ident, task_context_hid)
762765
} else {
763766
// Use of `await` outside of an async context, we cannot use `task_context` here.
764-
self.expr_err(span)
767+
self.expr_err(span, self.tcx.sess.delay_span_bug(span, "no task_context hir id"))
765768
};
766769
let new_unchecked = self.expr_call_lang_item_fn_mut(
767770
span,

‎compiler/rustc_ast_lowering/src/format.rs

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,12 @@ fn make_count<'hir>(
102102
let value = ctx.arena.alloc_from_iter([ctx.expr_usize(sp, i)]);
103103
ctx.expr_call_mut(sp, count_param, value)
104104
} else {
105-
ctx.expr(sp, hir::ExprKind::Err)
105+
ctx.expr(
106+
sp,
107+
hir::ExprKind::Err(
108+
ctx.tcx.sess.delay_span_bug(sp, "lowered bad format_args count"),
109+
),
110+
)
106111
}
107112
}
108113
None => ctx.expr_lang_item_type_relative(sp, hir::LangItem::FormatCount, sym::Implied),
@@ -135,7 +140,10 @@ fn make_format_spec<'hir>(
135140
argmap.insert_full((arg_index, ArgumentType::Format(placeholder.format_trait)));
136141
ctx.expr_usize(sp, i)
137142
}
138-
Err(_) => ctx.expr(sp, hir::ExprKind::Err),
143+
Err(_) => ctx.expr(
144+
sp,
145+
hir::ExprKind::Err(ctx.tcx.sess.delay_span_bug(sp, "lowered bad format_args count")),
146+
),
139147
};
140148
let &FormatOptions {
141149
ref width,
@@ -294,7 +302,12 @@ fn expand_format_args<'hir>(
294302
));
295303
make_argument(ctx, sp, arg, ty)
296304
} else {
297-
ctx.expr(macsp, hir::ExprKind::Err)
305+
ctx.expr(
306+
macsp,
307+
hir::ExprKind::Err(
308+
ctx.tcx.sess.delay_span_bug(macsp, format!("no arg at {arg_index}")),
309+
),
310+
)
298311
}
299312
}));
300313
let elements: Vec<_> = arguments

‎compiler/rustc_ast_lowering/src/item.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use rustc_ast::ptr::P;
77
use rustc_ast::visit::AssocCtxt;
88
use rustc_ast::*;
99
use rustc_data_structures::sorted_map::SortedMap;
10+
use rustc_errors::ErrorGuaranteed;
1011
use rustc_hir as hir;
1112
use rustc_hir::def::{DefKind, Res};
1213
use rustc_hir::def_id::{LocalDefId, CRATE_DEF_ID};
@@ -796,8 +797,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
796797
}
797798

798799
/// Construct `ExprKind::Err` for the given `span`.
799-
pub(crate) fn expr_err(&mut self, span: Span) -> hir::Expr<'hir> {
800-
self.expr(span, hir::ExprKind::Err)
800+
pub(crate) fn expr_err(&mut self, span: Span, guar: ErrorGuaranteed) -> hir::Expr<'hir> {
801+
self.expr(span, hir::ExprKind::Err(guar))
801802
}
802803

803804
fn lower_impl_item(&mut self, i: &AssocItem) -> &'hir hir::ImplItem<'hir> {
@@ -975,7 +976,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
975976
fn lower_block_expr_opt(&mut self, span: Span, block: Option<&Block>) -> hir::Expr<'hir> {
976977
match block {
977978
Some(block) => self.lower_block_expr(block),
978-
None => self.expr_err(span),
979+
None => self.expr_err(span, self.tcx.sess.delay_span_bug(span, "no block")),
979980
}
980981
}
981982

@@ -985,7 +986,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
985986
&[],
986987
match expr {
987988
Some(expr) => this.lower_expr_mut(expr),
988-
None => this.expr_err(span),
989+
None => this.expr_err(span, this.tcx.sess.delay_span_bug(span, "no block")),
989990
},
990991
)
991992
})

‎compiler/rustc_ast_lowering/src/pat.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
330330
ExprKind::Path(..) if allow_paths => {}
331331
ExprKind::Unary(UnOp::Neg, inner) if matches!(inner.kind, ExprKind::Lit(_)) => {}
332332
_ => {
333-
self.tcx.sess.emit_err(ArbitraryExpressionInPattern { span: expr.span });
334-
return self.arena.alloc(self.expr_err(expr.span));
333+
let guar = self.tcx.sess.emit_err(ArbitraryExpressionInPattern { span: expr.span });
334+
return self.arena.alloc(self.expr_err(expr.span, guar));
335335
}
336336
}
337337
self.lower_expr(expr)

‎compiler/rustc_hir/src/hir.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1688,7 +1688,7 @@ impl Expr<'_> {
16881688
ExprKind::Struct(..) => ExprPrecedence::Struct,
16891689
ExprKind::Repeat(..) => ExprPrecedence::Repeat,
16901690
ExprKind::Yield(..) => ExprPrecedence::Yield,
1691-
ExprKind::Err => ExprPrecedence::Err,
1691+
ExprKind::Err(_) => ExprPrecedence::Err,
16921692
}
16931693
}
16941694

@@ -1754,7 +1754,7 @@ impl Expr<'_> {
17541754
| ExprKind::Yield(..)
17551755
| ExprKind::Cast(..)
17561756
| ExprKind::DropTemps(..)
1757-
| ExprKind::Err => false,
1757+
| ExprKind::Err(_) => false,
17581758
}
17591759
}
17601760

@@ -1840,7 +1840,7 @@ impl Expr<'_> {
18401840
| ExprKind::Binary(..)
18411841
| ExprKind::Yield(..)
18421842
| ExprKind::DropTemps(..)
1843-
| ExprKind::Err => true,
1843+
| ExprKind::Err(_) => true,
18441844
}
18451845
}
18461846

@@ -2013,7 +2013,7 @@ pub enum ExprKind<'hir> {
20132013
Yield(&'hir Expr<'hir>, YieldSource),
20142014

20152015
/// A placeholder for an expression that wasn't syntactically well formed in some way.
2016-
Err,
2016+
Err(rustc_span::ErrorGuaranteed),
20172017
}
20182018

20192019
/// Represents an optionally `Self`-qualified value/type path or associated extension.

‎compiler/rustc_hir/src/intravisit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ pub fn walk_expr<'v, V: Visitor<'v>>(visitor: &mut V, expression: &'v Expr<'v>)
790790
ExprKind::Yield(ref subexpression, _) => {
791791
visitor.visit_expr(subexpression);
792792
}
793-
ExprKind::Lit(_) | ExprKind::Err => {}
793+
ExprKind::Lit(_) | ExprKind::Err(_) => {}
794794
}
795795
}
796796

‎compiler/rustc_hir_pretty/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1559,7 +1559,7 @@ impl<'a> State<'a> {
15591559
self.word_space("yield");
15601560
self.print_expr_maybe_paren(expr, parser::PREC_JUMP);
15611561
}
1562-
hir::ExprKind::Err => {
1562+
hir::ExprKind::Err(_) => {
15631563
self.popen();
15641564
self.word("/*ERROR*/");
15651565
self.pclose();

‎compiler/rustc_hir_typeck/src/expr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
354354
ExprKind::Field(base, field) => self.check_field(expr, &base, field, expected),
355355
ExprKind::Index(base, idx) => self.check_expr_index(base, idx, expr),
356356
ExprKind::Yield(value, ref src) => self.check_expr_yield(value, expr, src),
357-
hir::ExprKind::Err => tcx.ty_error_misc(),
357+
hir::ExprKind::Err(guar) => tcx.ty_error(guar),
358358
}
359359
}
360360

‎compiler/rustc_hir_typeck/src/expr_use_visitor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ impl<'a, 'tcx> ExprUseVisitor<'a, 'tcx> {
301301
hir::ExprKind::Continue(..)
302302
| hir::ExprKind::Lit(..)
303303
| hir::ExprKind::ConstBlock(..)
304-
| hir::ExprKind::Err => {}
304+
| hir::ExprKind::Err(_) => {}
305305

306306
hir::ExprKind::Loop(blk, ..) => {
307307
self.walk_block(blk);

‎compiler/rustc_hir_typeck/src/generator_interior/drop_ranges/cfg_build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ impl<'a, 'tcx> DropRangeVisitor<'a, 'tcx> {
219219
| ExprKind::Struct(..)
220220
| ExprKind::Repeat(..)
221221
| ExprKind::Yield(..)
222-
| ExprKind::Err => (),
222+
| ExprKind::Err(_) => (),
223223
}
224224
}
225225

@@ -483,7 +483,7 @@ impl<'a, 'tcx> Visitor<'tcx> for DropRangeVisitor<'a, 'tcx> {
483483
| ExprKind::Closure { .. }
484484
| ExprKind::ConstBlock(..)
485485
| ExprKind::DropTemps(..)
486-
| ExprKind::Err
486+
| ExprKind::Err(_)
487487
| ExprKind::Field(..)
488488
| ExprKind::Index(..)
489489
| ExprKind::InlineAsm(..)

‎compiler/rustc_hir_typeck/src/mem_categorization.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ impl<'a, 'tcx> MemCategorizationContext<'a, 'tcx> {
383383
| hir::ExprKind::Repeat(..)
384384
| hir::ExprKind::InlineAsm(..)
385385
| hir::ExprKind::Box(..)
386-
| hir::ExprKind::Err => Ok(self.cat_rvalue(expr.hir_id, expr.span, expr_ty)),
386+
| hir::ExprKind::Err(_) => Ok(self.cat_rvalue(expr.hir_id, expr.span, expr_ty)),
387387
}
388388
}
389389

‎compiler/rustc_mir_build/src/thir/cx/expr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ impl<'tcx> Cx<'tcx> {
758758
hir::ExprKind::Tup(ref fields) => ExprKind::Tuple { fields: self.mirror_exprs(fields) },
759759

760760
hir::ExprKind::Yield(ref v, _) => ExprKind::Yield { value: self.mirror_expr(v) },
761-
hir::ExprKind::Err => unreachable!(),
761+
hir::ExprKind::Err(_) => unreachable!(),
762762
};
763763

764764
Expr { temp_lifetime, ty: expr_ty, span: expr.span, kind }

‎compiler/rustc_passes/src/liveness.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ impl<'tcx> Visitor<'tcx> for IrMaps<'tcx> {
475475
| hir::ExprKind::InlineAsm(..)
476476
| hir::ExprKind::Box(..)
477477
| hir::ExprKind::Type(..)
478-
| hir::ExprKind::Err
478+
| hir::ExprKind::Err(_)
479479
| hir::ExprKind::Path(hir::QPath::TypeRelative(..))
480480
| hir::ExprKind::Path(hir::QPath::LangItem(..)) => {
481481
intravisit::walk_expr(self, expr);
@@ -1129,7 +1129,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
11291129

11301130
hir::ExprKind::Lit(..)
11311131
| hir::ExprKind::ConstBlock(..)
1132-
| hir::ExprKind::Err
1132+
| hir::ExprKind::Err(_)
11331133
| hir::ExprKind::Path(hir::QPath::TypeRelative(..))
11341134
| hir::ExprKind::Path(hir::QPath::LangItem(..)) => succ,
11351135

@@ -1427,7 +1427,7 @@ fn check_expr<'tcx>(this: &mut Liveness<'_, 'tcx>, expr: &'tcx Expr<'tcx>) {
14271427
| hir::ExprKind::Yield(..)
14281428
| hir::ExprKind::Box(..)
14291429
| hir::ExprKind::Type(..)
1430-
| hir::ExprKind::Err => {}
1430+
| hir::ExprKind::Err(_) => {}
14311431
}
14321432
}
14331433

‎compiler/rustc_passes/src/naked_functions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ impl<'tcx> CheckInlineAssembly<'tcx> {
219219
hir::intravisit::walk_expr(self, expr);
220220
}
221221

222-
ExprKind::Err => {
222+
ExprKind::Err(_) => {
223223
self.items.push((ItemKind::Err, span));
224224
}
225225
}

0 commit comments

Comments
 (0)