Skip to content

Commit e7b3c94

Browse files
compiler-errorscompiler-errors
committed
Pass ErrorGuaranteed to cycle error
1 parent 668bf8c commit e7b3c94

File tree

7 files changed

+59
-24
lines changed

7 files changed

+59
-24
lines changed

‎compiler/rustc_middle/src/query/plumbing.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use rustc_query_system::dep_graph::SerializedDepNodeIndex;
1919
pub(crate) use rustc_query_system::query::QueryJobId;
2020
use rustc_query_system::query::*;
2121
use rustc_query_system::HandleCycleError;
22-
use rustc_span::{Span, DUMMY_SP};
22+
use rustc_span::{ErrorGuaranteed, Span, DUMMY_SP};
2323
use std::ops::Deref;
2424

2525
pub struct QueryKeyStringCache {
@@ -52,7 +52,8 @@ pub struct DynamicQuery<'tcx, C: QueryCache> {
5252
pub loadable_from_disk:
5353
fn(tcx: TyCtxt<'tcx>, key: &C::Key, index: SerializedDepNodeIndex) -> bool,
5454
pub hash_result: HashResult<C::Value>,
55-
pub value_from_cycle_error: fn(tcx: TyCtxt<'tcx>, cycle: &[QueryInfo<DepKind>]) -> C::Value,
55+
pub value_from_cycle_error:
56+
fn(tcx: TyCtxt<'tcx>, cycle: &[QueryInfo<DepKind>], guar: ErrorGuaranteed) -> C::Value,
5657
pub format_value: fn(&C::Value) -> String,
5758
}
5859

‎compiler/rustc_middle/src/values.rs‎

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,28 @@ use rustc_middle::ty::{self, Ty, TyCtxt};
88
use rustc_query_system::query::QueryInfo;
99
use rustc_query_system::Value;
1010
use rustc_span::def_id::LocalDefId;
11-
use rustc_span::Span;
11+
use rustc_span::{ErrorGuaranteed, Span};
1212

1313
use std::fmt::Write;
1414

1515
impl<'tcx> Value<TyCtxt<'tcx>, DepKind> for Ty<'_> {
16-
fn from_cycle_error(tcx: TyCtxt<'tcx>, _: &[QueryInfo<DepKind>]) -> Self {
16+
fn from_cycle_error(
17+
tcx: TyCtxt<'tcx>,
18+
_: &[QueryInfo<DepKind>],
19+
guar: ErrorGuaranteed,
20+
) -> Self {
1721
// SAFETY: This is never called when `Self` is not `Ty<'tcx>`.
1822
// FIXME: Represent the above fact in the trait system somehow.
19-
unsafe { std::mem::transmute::<Ty<'tcx>, Ty<'_>>(Ty::new_misc_error(tcx)) }
23+
unsafe { std::mem::transmute::<Ty<'tcx>, Ty<'_>>(Ty::new_error(tcx, guar)) }
2024
}
2125
}
2226

2327
impl<'tcx> Value<TyCtxt<'tcx>, DepKind> for ty::SymbolName<'_> {
24-
fn from_cycle_error(tcx: TyCtxt<'tcx>, _: &[QueryInfo<DepKind>]) -> Self {
28+
fn from_cycle_error(
29+
tcx: TyCtxt<'tcx>,
30+
_: &[QueryInfo<DepKind>],
31+
_guar: ErrorGuaranteed,
32+
) -> Self {
2533
// SAFETY: This is never called when `Self` is not `SymbolName<'tcx>`.
2634
// FIXME: Represent the above fact in the trait system somehow.
2735
unsafe {
@@ -33,8 +41,12 @@ impl<'tcx> Value<TyCtxt<'tcx>, DepKind> for ty::SymbolName<'_> {
3341
}
3442

3543
impl<'tcx> Value<TyCtxt<'tcx>, DepKind> for ty::Binder<'_, ty::FnSig<'_>> {
36-
fn from_cycle_error(tcx: TyCtxt<'tcx>, stack: &[QueryInfo<DepKind>]) -> Self {
37-
let err = Ty::new_misc_error(tcx);
44+
fn from_cycle_error(
45+
tcx: TyCtxt<'tcx>,
46+
stack: &[QueryInfo<DepKind>],
47+
guar: ErrorGuaranteed,
48+
) -> Self {
49+
let err = Ty::new_error(tcx, guar);
3850

3951
let arity = if let Some(frame) = stack.get(0)
4052
&& frame.query.dep_kind == DepKind::fn_sig
@@ -63,7 +75,11 @@ impl<'tcx> Value<TyCtxt<'tcx>, DepKind> for ty::Binder<'_, ty::FnSig<'_>> {
6375
}
6476

6577
impl<'tcx> Value<TyCtxt<'tcx>, DepKind> for Representability {
66-
fn from_cycle_error(tcx: TyCtxt<'tcx>, cycle: &[QueryInfo<DepKind>]) -> Self {
78+
fn from_cycle_error(
79+
tcx: TyCtxt<'tcx>,
80+
cycle: &[QueryInfo<DepKind>],
81+
_guar: ErrorGuaranteed,
82+
) -> Self {
6783
let mut item_and_field_ids = Vec::new();
6884
let mut representable_ids = FxHashSet::default();
6985
for info in cycle {
@@ -95,22 +111,35 @@ impl<'tcx> Value<TyCtxt<'tcx>, DepKind> for Representability {
95111
}
96112

97113
impl<'tcx> Value<TyCtxt<'tcx>, DepKind> for ty::EarlyBinder<Ty<'_>> {
98-
fn from_cycle_error(tcx: TyCtxt<'tcx>, cycle: &[QueryInfo<DepKind>]) -> Self {
99-
ty::EarlyBinder::bind(Ty::from_cycle_error(tcx, cycle))
114+
fn from_cycle_error(
115+
tcx: TyCtxt<'tcx>,
116+
cycle: &[QueryInfo<DepKind>],
117+
guar: ErrorGuaranteed,
118+
) -> Self {
119+
ty::EarlyBinder::bind(Ty::from_cycle_error(tcx, cycle, guar))
100120
}
101121
}
102122

103123
impl<'tcx> Value<TyCtxt<'tcx>, DepKind> for ty::EarlyBinder<ty::Binder<'_, ty::FnSig<'_>>> {
104-
fn from_cycle_error(tcx: TyCtxt<'tcx>, cycle: &[QueryInfo<DepKind>]) -> Self {
105-
ty::EarlyBinder::bind(ty::Binder::from_cycle_error(tcx, cycle))
124+
fn from_cycle_error(
125+
tcx: TyCtxt<'tcx>,
126+
cycle: &[QueryInfo<DepKind>],
127+
guar: ErrorGuaranteed,
128+
) -> Self {
129+
ty::EarlyBinder::bind(ty::Binder::from_cycle_error(tcx, cycle, guar))
106130
}
107131
}
108132

109133
impl<'tcx, T> Value<TyCtxt<'tcx>, DepKind> for Result<T, &'_ ty::layout::LayoutError<'_>> {
110-
fn from_cycle_error(_tcx: TyCtxt<'tcx>, _cycle: &[QueryInfo<DepKind>]) -> Self {
134+
fn from_cycle_error(
135+
_tcx: TyCtxt<'tcx>,
136+
_cycle: &[QueryInfo<DepKind>],
137+
_guar: ErrorGuaranteed,
138+
) -> Self {
111139
// tcx.arena.alloc cannot be used because we are not allowed to use &'tcx LayoutError under
112140
// min_specialization. Since this is an error path anyways, leaking doesn't matter (and really,
113141
// tcx.arena.alloc is pretty much equal to leaking).
142+
// FIXME: `Cycle` should carry the ErrorGuaranteed
114143
Err(Box::leak(Box::new(ty::layout::LayoutError::Cycle)))
115144
}
116145
}

‎compiler/rustc_query_impl/src/lib.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ use rustc_query_system::query::{
4141
};
4242
use rustc_query_system::HandleCycleError;
4343
use rustc_query_system::Value;
44-
use rustc_span::Span;
44+
use rustc_span::{ErrorGuaranteed, Span};
4545

4646
#[macro_use]
4747
mod plumbing;
@@ -146,8 +146,9 @@ where
146146
self,
147147
tcx: TyCtxt<'tcx>,
148148
cycle: &[QueryInfo<DepKind>],
149+
guar: ErrorGuaranteed,
149150
) -> Self::Value {
150-
(self.dynamic.value_from_cycle_error)(tcx, cycle)
151+
(self.dynamic.value_from_cycle_error)(tcx, cycle, guar)
151152
}
152153

153154
#[inline(always)]

‎compiler/rustc_query_impl/src/plumbing.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -605,8 +605,8 @@ macro_rules! define_queries {
605605
} {
606606
|_tcx, _key, _prev_index, _index| None
607607
}),
608-
value_from_cycle_error: |tcx, cycle| {
609-
let result: queries::$name::Value<'tcx> = Value::from_cycle_error(tcx, cycle);
608+
value_from_cycle_error: |tcx, cycle, guar| {
609+
let result: queries::$name::Value<'tcx> = Value::from_cycle_error(tcx, cycle, guar);
610610
erase(result)
611611
},
612612
loadable_from_disk: |_tcx, _key, _index| {

‎compiler/rustc_query_system/src/query/config.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use crate::query::DepNodeIndex;
88
use crate::query::{QueryContext, QueryInfo, QueryState};
99

1010
use rustc_data_structures::fingerprint::Fingerprint;
11+
use rustc_span::ErrorGuaranteed;
1112
use std::fmt::Debug;
1213
use std::hash::Hash;
1314

@@ -57,6 +58,7 @@ pub trait QueryConfig<Qcx: QueryContext>: Copy {
5758
self,
5859
tcx: Qcx::DepContext,
5960
cycle: &[QueryInfo<Qcx::DepKind>],
61+
guar: ErrorGuaranteed,
6062
) -> Self::Value;
6163

6264
fn anon(self) -> bool;

‎compiler/rustc_query_system/src/query/plumbing.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,17 +148,17 @@ where
148148
use HandleCycleError::*;
149149
match query.handle_cycle_error() {
150150
Error => {
151-
error.emit();
152-
query.value_from_cycle_error(*qcx.dep_context(), &cycle_error.cycle)
151+
let guar = error.emit();
152+
query.value_from_cycle_error(*qcx.dep_context(), &cycle_error.cycle, guar)
153153
}
154154
Fatal => {
155155
error.emit();
156156
qcx.dep_context().sess().abort_if_errors();
157157
unreachable!()
158158
}
159159
DelayBug => {
160-
error.delay_as_bug();
161-
query.value_from_cycle_error(*qcx.dep_context(), &cycle_error.cycle)
160+
let guar = error.delay_as_bug();
161+
query.value_from_cycle_error(*qcx.dep_context(), &cycle_error.cycle, guar)
162162
}
163163
}
164164
}

‎compiler/rustc_query_system/src/values.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
use rustc_span::ErrorGuaranteed;
2+
13
use crate::dep_graph::{DepContext, DepKind};
24
use crate::query::QueryInfo;
35

46
pub trait Value<Tcx: DepContext, D: DepKind>: Sized {
5-
fn from_cycle_error(tcx: Tcx, cycle: &[QueryInfo<D>]) -> Self;
7+
fn from_cycle_error(tcx: Tcx, cycle: &[QueryInfo<D>], guar: ErrorGuaranteed) -> Self;
68
}
79

810
impl<Tcx: DepContext, T, D: DepKind> Value<Tcx, D> for T {
9-
default fn from_cycle_error(tcx: Tcx, cycle: &[QueryInfo<D>]) -> T {
11+
default fn from_cycle_error(tcx: Tcx, cycle: &[QueryInfo<D>], _guar: ErrorGuaranteed) -> T {
1012
tcx.sess().abort_if_errors();
1113
// Ideally we would use `bug!` here. But bug! is only defined in rustc_middle, and it's
1214
// non-trivial to define it earlier.

0 commit comments

Comments
 (0)