Skip to content

Commit d1110a4

Browse files
borsbors
committed
Auto merge of #120651 - matthiaskrgr:rollup-o5qdp0n, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #120507 (Account for non-overlapping unmet trait bounds in suggestion) - #120518 (riscv only supports split_debuginfo=off for now) - #120521 (Make `NonZero` constructors generic.) - #120527 (Switch OwnedStore handle count to AtomicU32) - #120550 (Continue to borrowck even if there were previous errors) - #120587 (miri: normalize struct tail in ABI compat check) - #120590 (Remove unused args from functions) - #120607 (fix #120603 by adding a check in default_read_buf) Failed merges: - #120575 (Simplify codegen diagnostic handling) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 4d87c4a + c168f17 commit d1110a4

File tree

258 files changed

+3613
-936
lines changed

Some content is hidden

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

258 files changed

+3613
-936
lines changed

‎compiler/rustc_borrowck/src/lib.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,16 @@ fn mir_borrowck(tcx: TyCtxt<'_>, def: LocalDefId) -> &BorrowCheckResult<'_> {
110110
let (input_body, promoted) = tcx.mir_promoted(def);
111111
debug!("run query mir_borrowck: {}", tcx.def_path_str(def));
112112

113-
if input_body.borrow().should_skip() {
114-
debug!("Skipping borrowck because of injected body");
113+
let input_body: &Body<'_> = &input_body.borrow();
114+
115+
if input_body.should_skip() || input_body.tainted_by_errors.is_some() {
116+
debug!("Skipping borrowck because of injected body or tainted body");
115117
// Let's make up a borrowck result! Fun times!
116118
let result = BorrowCheckResult {
117119
concrete_opaque_types: FxIndexMap::default(),
118120
closure_requirements: None,
119121
used_mut_upvars: SmallVec::new(),
120-
tainted_by_errors: None,
122+
tainted_by_errors: input_body.tainted_by_errors,
121123
};
122124
return tcx.arena.alloc(result);
123125
}
@@ -126,7 +128,6 @@ fn mir_borrowck(tcx: TyCtxt<'_>, def: LocalDefId) -> &BorrowCheckResult<'_> {
126128

127129
let infcx =
128130
tcx.infer_ctxt().with_opaque_type_inference(DefiningAnchor::Bind(hir_owner.def_id)).build();
129-
let input_body: &Body<'_> = &input_body.borrow();
130131
let promoted: &IndexSlice<_, _> = &promoted.borrow();
131132
let opt_closure_req = do_mir_borrowck(&infcx, input_body, promoted, None).0;
132133
debug!("mir_borrowck done");

‎compiler/rustc_borrowck/src/nll.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ pub(crate) fn compute_regions<'cx, 'tcx>(
184184

185185
// Solve the region constraints.
186186
let (closure_region_requirements, nll_errors) =
187-
regioncx.solve(infcx, param_env, body, polonius_output.clone());
187+
regioncx.solve(infcx, body, polonius_output.clone());
188188

189189
if !nll_errors.is_empty() {
190190
// Suppress unhelpful extra errors in `infer_opaque_types`.

‎compiler/rustc_borrowck/src/region_infer/mod.rs

+2-39
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,6 @@ impl<'tcx> RegionInferenceContext<'tcx> {
658658
pub(super) fn solve(
659659
&mut self,
660660
infcx: &InferCtxt<'tcx>,
661-
param_env: ty::ParamEnv<'tcx>,
662661
body: &Body<'tcx>,
663662
polonius_output: Option<Rc<PoloniusOutput>>,
664663
) -> (Option<ClosureRegionRequirements<'tcx>>, RegionErrors<'tcx>) {
@@ -674,7 +673,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
674673
// eagerly.
675674
let mut outlives_requirements = infcx.tcx.is_typeck_child(mir_def_id).then(Vec::new);
676675

677-
self.check_type_tests(infcx, body, outlives_requirements.as_mut(), &mut errors_buffer);
676+
self.check_type_tests(infcx, outlives_requirements.as_mut(), &mut errors_buffer);
678677

679678
debug!(?errors_buffer);
680679
debug!(?outlives_requirements);
@@ -932,7 +931,6 @@ impl<'tcx> RegionInferenceContext<'tcx> {
932931
fn check_type_tests(
933932
&self,
934933
infcx: &InferCtxt<'tcx>,
935-
body: &Body<'tcx>,
936934
mut propagated_outlives_requirements: Option<&mut Vec<ClosureOutlivesRequirement<'tcx>>>,
937935
errors_buffer: &mut RegionErrors<'tcx>,
938936
) {
@@ -957,12 +955,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
957955
}
958956

959957
if let Some(propagated_outlives_requirements) = &mut propagated_outlives_requirements {
960-
if self.try_promote_type_test(
961-
infcx,
962-
body,
963-
type_test,
964-
propagated_outlives_requirements,
965-
) {
958+
if self.try_promote_type_test(infcx, type_test, propagated_outlives_requirements) {
966959
continue;
967960
}
968961
}
@@ -1016,7 +1009,6 @@ impl<'tcx> RegionInferenceContext<'tcx> {
10161009
fn try_promote_type_test(
10171010
&self,
10181011
infcx: &InferCtxt<'tcx>,
1019-
body: &Body<'tcx>,
10201012
type_test: &TypeTest<'tcx>,
10211013
propagated_outlives_requirements: &mut Vec<ClosureOutlivesRequirement<'tcx>>,
10221014
) -> bool {
@@ -1179,35 +1171,6 @@ impl<'tcx> RegionInferenceContext<'tcx> {
11791171
Some(ClosureOutlivesSubject::Ty(ClosureOutlivesSubjectTy::bind(tcx, ty)))
11801172
}
11811173

1182-
/// Returns a universally quantified region that outlives the
1183-
/// value of `r` (`r` may be existentially or universally
1184-
/// quantified).
1185-
///
1186-
/// Since `r` is (potentially) an existential region, it has some
1187-
/// value which may include (a) any number of points in the CFG
1188-
/// and (b) any number of `end('x)` elements of universally
1189-
/// quantified regions. To convert this into a single universal
1190-
/// region we do as follows:
1191-
///
1192-
/// - Ignore the CFG points in `'r`. All universally quantified regions
1193-
/// include the CFG anyhow.
1194-
/// - For each `end('x)` element in `'r`, compute the mutual LUB, yielding
1195-
/// a result `'y`.
1196-
#[instrument(skip(self), level = "debug", ret)]
1197-
pub(crate) fn universal_upper_bound(&self, r: RegionVid) -> RegionVid {
1198-
debug!(r = %self.region_value_str(r));
1199-
1200-
// Find the smallest universal region that contains all other
1201-
// universal regions within `region`.
1202-
let mut lub = self.universal_regions.fr_fn_body;
1203-
let r_scc = self.constraint_sccs.scc(r);
1204-
for ur in self.scc_values.universal_regions_outlived_by(r_scc) {
1205-
lub = self.universal_region_relations.postdom_upper_bound(lub, ur);
1206-
}
1207-
1208-
lub
1209-
}
1210-
12111174
/// Like `universal_upper_bound`, but returns an approximation more suitable
12121175
/// for diagnostics. If `r` contains multiple disjoint universal regions
12131176
/// (e.g. 'a and 'b in `fn foo<'a, 'b> { ... }`, we pick the lower-numbered region.

‎compiler/rustc_borrowck/src/type_check/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ pub(crate) fn type_check<'mir, 'tcx>(
217217
CustomTypeOp::new(
218218
|ocx| {
219219
ocx.infcx.register_member_constraints(
220-
param_env,
221220
opaque_type_key,
222221
decl.hidden_type.ty,
223222
decl.hidden_type.span,

‎compiler/rustc_const_eval/src/interpret/terminator.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,11 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
373373
if let (Some(caller), Some(callee)) = (pointee_ty(caller.ty)?, pointee_ty(callee.ty)?) {
374374
// This is okay if they have the same metadata type.
375375
let meta_ty = |ty: Ty<'tcx>| {
376-
let (meta, only_if_sized) = ty.ptr_metadata_ty(*self.tcx, |ty| ty);
376+
// Even if `ty` is normalized, the search for the unsized tail will project
377+
// to fields, which can yield non-normalized types. So we need to provide a
378+
// normalization function.
379+
let normalize = |ty| self.tcx.normalize_erasing_regions(self.param_env, ty);
380+
let (meta, only_if_sized) = ty.ptr_metadata_ty(*self.tcx, normalize);
377381
assert!(
378382
!only_if_sized,
379383
"there should be no more 'maybe has that metadata' types during interpretation"

‎compiler/rustc_hir/src/hir.rs

-4
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,6 @@ impl Lifetime {
163163
(LifetimeSuggestionPosition::Normal, self.ident.span)
164164
}
165165
}
166-
167-
pub fn is_static(&self) -> bool {
168-
self.res == LifetimeName::Static
169-
}
170166
}
171167

172168
/// A `Path` is essentially Rust's notion of a name; for instance,

‎compiler/rustc_hir_analysis/src/astconv/bounds.rs

-2
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,7 @@ impl<'tcx> dyn AstConv<'tcx> + '_ {
243243
speculative: bool,
244244
dup_bindings: &mut FxHashMap<DefId, Span>,
245245
path_span: Span,
246-
constness: ty::BoundConstness,
247246
only_self_bounds: OnlySelfBounds,
248-
polarity: ty::ImplPolarity,
249247
) -> Result<(), ErrorGuaranteed> {
250248
// Given something like `U: SomeTrait<T = X>`, we want to produce a
251249
// predicate like `<U as SomeTrait>::T = X`. This is somewhat

‎compiler/rustc_hir_analysis/src/astconv/generics.rs

+2-14
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use rustc_middle::ty::{
1616
self, GenericArgsRef, GenericParamDef, GenericParamDefKind, IsSuggestable, Ty, TyCtxt,
1717
};
1818
use rustc_session::lint::builtin::LATE_BOUND_LIFETIME_ARGUMENTS;
19-
use rustc_span::{symbol::kw, Span};
19+
use rustc_span::symbol::kw;
2020
use smallvec::SmallVec;
2121

2222
/// Report an error that a generic argument did not match the generic parameter that was
@@ -404,7 +404,6 @@ pub fn create_args_for_parent_generic_args<'tcx: 'a, 'a>(
404404
/// Used specifically for function calls.
405405
pub fn check_generic_arg_count_for_call(
406406
tcx: TyCtxt<'_>,
407-
span: Span,
408407
def_id: DefId,
409408
generics: &ty::Generics,
410409
seg: &hir::PathSegment<'_>,
@@ -418,25 +417,14 @@ pub fn check_generic_arg_count_for_call(
418417
};
419418
let has_self = generics.parent.is_none() && generics.has_self;
420419

421-
check_generic_arg_count(
422-
tcx,
423-
span,
424-
def_id,
425-
seg,
426-
generics,
427-
gen_args,
428-
gen_pos,
429-
has_self,
430-
seg.infer_args,
431-
)
420+
check_generic_arg_count(tcx, def_id, seg, generics, gen_args, gen_pos, has_self, seg.infer_args)
432421
}
433422

434423
/// Checks that the correct number of generic arguments have been provided.
435424
/// This is used both for datatypes and function calls.
436425
#[instrument(skip(tcx, gen_pos), level = "debug")]
437426
pub(crate) fn check_generic_arg_count(
438427
tcx: TyCtxt<'_>,
439-
span: Span,
440428
def_id: DefId,
441429
seg: &hir::PathSegment<'_>,
442430
gen_params: &ty::Generics,

‎compiler/rustc_hir_analysis/src/astconv/mod.rs

+7-25
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use crate::astconv::errors::prohibit_assoc_ty_binding;
1212
use crate::astconv::generics::{check_generic_arg_count, create_args_for_parent_generic_args};
1313
use crate::bounds::Bounds;
1414
use crate::collect::HirPlaceholderCollector;
15-
use crate::errors::{AmbiguousLifetimeBound, TypeofReservedKeywordUsed};
15+
use crate::errors::AmbiguousLifetimeBound;
1616
use crate::middle::resolve_bound_vars as rbv;
1717
use crate::require_c_abi_if_c_variadic;
1818
use rustc_ast::TraitObjectSyntax;
@@ -25,13 +25,13 @@ use rustc_hir as hir;
2525
use rustc_hir::def::{CtorOf, DefKind, Namespace, Res};
2626
use rustc_hir::def_id::{DefId, LocalDefId};
2727
use rustc_hir::intravisit::{walk_generics, Visitor as _};
28-
use rustc_hir::{GenericArg, GenericArgs, OpaqueTyOrigin};
28+
use rustc_hir::{GenericArg, GenericArgs};
2929
use rustc_infer::infer::{InferCtxt, TyCtxtInferExt};
3030
use rustc_infer::traits::ObligationCause;
3131
use rustc_middle::middle::stability::AllowUnstable;
3232
use rustc_middle::ty::{
33-
self, Const, GenericArgKind, GenericArgsRef, GenericParamDefKind, IsSuggestable, ParamEnv, Ty,
34-
TyCtxt, TypeVisitableExt,
33+
self, Const, GenericArgKind, GenericArgsRef, GenericParamDefKind, ParamEnv, Ty, TyCtxt,
34+
TypeVisitableExt,
3535
};
3636
use rustc_session::lint::builtin::AMBIGUOUS_ASSOCIATED_ITEMS;
3737
use rustc_span::edit_distance::find_best_match_for_name;
@@ -379,7 +379,6 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
379379

380380
let mut arg_count = check_generic_arg_count(
381381
tcx,
382-
span,
383382
def_id,
384383
seg,
385384
generics,
@@ -773,9 +772,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
773772
speculative,
774773
&mut dup_bindings,
775774
binding.span,
776-
constness,
777775
only_self_bounds,
778-
polarity,
779776
);
780777
// Okay to ignore `Err` because of `ErrorGuaranteed` (see above).
781778
}
@@ -2491,7 +2488,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
24912488
let opaque_ty = tcx.hir().item(item_id);
24922489

24932490
match opaque_ty.kind {
2494-
hir::ItemKind::OpaqueTy(&hir::OpaqueTy { origin, .. }) => {
2491+
hir::ItemKind::OpaqueTy(&hir::OpaqueTy { .. }) => {
24952492
let local_def_id = item_id.owner_id.def_id;
24962493
// If this is an RPITIT and we are using the new RPITIT lowering scheme, we
24972494
// generate the def_id of an associated type for the trait and return as
@@ -2501,7 +2498,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
25012498
} else {
25022499
local_def_id.to_def_id()
25032500
};
2504-
self.impl_trait_ty_to_ty(def_id, lifetimes, origin, in_trait)
2501+
self.impl_trait_ty_to_ty(def_id, lifetimes, in_trait)
25052502
}
25062503
ref i => bug!("`impl Trait` pointed to non-opaque type?? {:#?}", i),
25072504
}
@@ -2537,21 +2534,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
25372534

25382535
Ty::new_array_with_const_len(tcx, self.ast_ty_to_ty(ty), length)
25392536
}
2540-
hir::TyKind::Typeof(e) => {
2541-
let ty_erased = tcx.type_of(e.def_id).instantiate_identity();
2542-
let ty = tcx.fold_regions(ty_erased, |r, _| {
2543-
if r.is_erased() { tcx.lifetimes.re_static } else { r }
2544-
});
2545-
let span = ast_ty.span;
2546-
let (ty, opt_sugg) = if let Some(ty) = ty.make_suggestable(tcx, false) {
2547-
(ty, Some((span, Applicability::MachineApplicable)))
2548-
} else {
2549-
(ty, None)
2550-
};
2551-
tcx.dcx().emit_err(TypeofReservedKeywordUsed { span, ty, opt_sugg });
2552-
2553-
ty
2554-
}
2537+
hir::TyKind::Typeof(e) => tcx.type_of(e.def_id).instantiate_identity(),
25552538
hir::TyKind::Infer => {
25562539
// Infer also appears as the type of arguments or return
25572540
// values in an ExprKind::Closure, or as
@@ -2571,7 +2554,6 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
25712554
&self,
25722555
def_id: DefId,
25732556
lifetimes: &[hir::GenericArg<'_>],
2574-
origin: OpaqueTyOrigin,
25752557
in_trait: bool,
25762558
) -> Ty<'tcx> {
25772559
debug!("impl_trait_ty_to_ty(def_id={:?}, lifetimes={:?})", def_id, lifetimes);

‎compiler/rustc_hir_analysis/src/collect/type_of.rs

+14-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ use rustc_middle::ty::{self, ImplTraitInTraitData, IsSuggestable, Ty, TyCtxt, Ty
99
use rustc_span::symbol::Ident;
1010
use rustc_span::{Span, DUMMY_SP};
1111

12+
use crate::errors::TypeofReservedKeywordUsed;
13+
1214
use super::bad_placeholder;
1315
use super::ItemCtxt;
1416
pub use opaque::test_opaque_hidden_types;
@@ -39,8 +41,18 @@ fn anon_const_type_of<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId) -> Ty<'tcx> {
3941
{
4042
return tcx.types.usize;
4143
}
42-
Node::Ty(&hir::Ty { kind: TyKind::Typeof(ref e), .. }) if e.hir_id == hir_id => {
43-
return tcx.typeck(def_id).node_type(e.hir_id);
44+
Node::Ty(&hir::Ty { kind: TyKind::Typeof(ref e), span, .. }) if e.hir_id == hir_id => {
45+
let ty = tcx.typeck(def_id).node_type(e.hir_id);
46+
let ty = tcx.fold_regions(ty, |r, _| {
47+
if r.is_erased() { ty::Region::new_error_misc(tcx) } else { r }
48+
});
49+
let (ty, opt_sugg) = if let Some(ty) = ty.make_suggestable(tcx, false) {
50+
(ty, Some((span, Applicability::MachineApplicable)))
51+
} else {
52+
(ty, None)
53+
};
54+
tcx.dcx().emit_err(TypeofReservedKeywordUsed { span, ty, opt_sugg });
55+
return ty;
4456
}
4557
Node::Expr(&Expr { kind: ExprKind::InlineAsm(asm), .. })
4658
| Node::Item(&Item { kind: ItemKind::GlobalAsm(asm), .. })

‎compiler/rustc_hir_analysis/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ pub fn check_crate(tcx: TyCtxt<'_>) -> Result<(), ErrorGuaranteed> {
209209

210210
tcx.ensure().check_unused_traits(());
211211

212-
if let Some(reported) = tcx.dcx().has_errors() { Err(reported) } else { Ok(()) }
212+
Ok(())
213213
}
214214

215215
/// A quasi-deprecated helper used in rustdoc and clippy to get

‎compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

+3-9
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
521521
/// We must not attempt to select obligations after this method has run, or risk query cycle
522522
/// ICE.
523523
#[instrument(level = "debug", skip(self))]
524-
pub(in super::super) fn resolve_coroutine_interiors(&self, def_id: DefId) {
524+
pub(in super::super) fn resolve_coroutine_interiors(&self) {
525525
// Try selecting all obligations that are not blocked on inference variables.
526526
// Once we start unifying coroutine witnesses, trying to select obligations on them will
527527
// trigger query cycle ICEs, as doing so requires MIR.
@@ -1175,14 +1175,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
11751175
// parameter internally, but we don't allow users to specify the
11761176
// parameter's value explicitly, so we have to do some error-
11771177
// checking here.
1178-
let arg_count = check_generic_arg_count_for_call(
1179-
tcx,
1180-
span,
1181-
def_id,
1182-
generics,
1183-
seg,
1184-
IsMethodCall::No,
1185-
);
1178+
let arg_count =
1179+
check_generic_arg_count_for_call(tcx, def_id, generics, seg, IsMethodCall::No);
11861180

11871181
if let ExplicitLateBound::Yes = arg_count.explicit_late_bound {
11881182
explicit_late_bound = ExplicitLateBound::Yes;

‎compiler/rustc_hir_typeck/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ fn typeck_with_fallback<'tcx>(
286286
debug!(pending_obligations = ?fcx.fulfillment_cx.borrow().pending_obligations());
287287

288288
// This must be the last thing before `report_ambiguity_errors`.
289-
fcx.resolve_coroutine_interiors(def_id.to_def_id());
289+
fcx.resolve_coroutine_interiors();
290290

291291
debug!(pending_obligations = ?fcx.fulfillment_cx.borrow().pending_obligations());
292292

‎compiler/rustc_hir_typeck/src/mem_categorization.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,8 @@ impl<'a, 'tcx> MemCategorizationContext<'a, 'tcx> {
436436
pub(crate) fn cat_rvalue(
437437
&self,
438438
hir_id: hir::HirId,
439-
span: Span,
439+
// FIXME: remove
440+
_span: Span,
440441
expr_ty: Ty<'tcx>,
441442
) -> PlaceWithHirId<'tcx> {
442443
PlaceWithHirId::new(hir_id, expr_ty, PlaceBase::Rvalue, Vec::new())

‎compiler/rustc_hir_typeck/src/method/confirm.rs

-1
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@ impl<'a, 'tcx> ConfirmContext<'a, 'tcx> {
356356

357357
let arg_count_correct = check_generic_arg_count_for_call(
358358
self.tcx,
359-
self.span,
360359
pick.item.def_id,
361360
generics,
362361
seg,

0 commit comments

Comments
 (0)