Skip to content

Commit 2e57231

Browse files
committed
Auto merge of rust-lang#77616 - jyn514:no-normalize, r=lcnr
Don't run `resolve_vars_if_possible` in `normalize_erasing_regions` Neither `@eddyb` nor I could figure out what this was for. I changed it to `assert_eq!(normalized_value, infcx.resolve_vars_if_possible(&normalized_value));` and it passed the UI test suite. <details><summary> Outdated, I figured out the issue - `needs_infer()` needs to come _after_ erasing the lifetimes </summary> Strangely, if I change it to `assert!(!normalized_value.needs_infer())` it panics almost immediately: ``` query stack during panic: #0 [normalize_generic_arg_after_erasing_regions] normalizing `<str::IsWhitespace as str::pattern::Pattern>::Searcher` #1 [needs_drop_raw] computing whether `str::iter::Split<str::IsWhitespace>` needs drop #2 [mir_built] building MIR for `str::<impl str>::split_whitespace` #3 [unsafety_check_result] unsafety-checking `str::<impl str>::split_whitespace` #4 [mir_const] processing MIR for `str::<impl str>::split_whitespace` #5 [mir_promoted] processing `str::<impl str>::split_whitespace` #6 [mir_borrowck] borrow-checking `str::<impl str>::split_whitespace` #7 [analysis] running analysis passes on this crate end of query stack ``` I'm not entirely sure what's going on - maybe the two disagree? </details> For context, this came up while reviewing rust-lang#77467 (cc `@lcnr).` Possibly this needs a crater run? r? `@nikomatsakis` cc `@matthewjasper`
2 parents 760430e + 6354e85 commit 2e57231

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

compiler/rustc_traits/src/normalize_erasing_regions.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use rustc_infer::infer::TyCtxtInferExt;
22
use rustc_middle::traits::query::NoSolution;
33
use rustc_middle::ty::query::Providers;
44
use rustc_middle::ty::subst::GenericArg;
5-
use rustc_middle::ty::{self, ParamEnvAnd, TyCtxt};
5+
use rustc_middle::ty::{self, ParamEnvAnd, TyCtxt, TypeFoldable};
66
use rustc_trait_selection::traits::query::normalize::AtExt;
77
use rustc_trait_selection::traits::{Normalized, ObligationCause};
88
use std::sync::atomic::Ordering;
@@ -31,8 +31,14 @@ fn normalize_generic_arg_after_erasing_regions<'tcx>(
3131
None,
3232
);
3333

34-
let normalized_value = infcx.resolve_vars_if_possible(normalized_value);
35-
infcx.tcx.erase_regions(normalized_value)
34+
let resolved_value = infcx.resolve_vars_if_possible(normalized_value);
35+
// It's unclear when `resolve_vars` would have an effect in a
36+
// fresh `InferCtxt`. If this assert does trigger, it will give
37+
// us a test case.
38+
debug_assert_eq!(normalized_value, resolved_value);
39+
let erased = infcx.tcx.erase_regions(resolved_value);
40+
debug_assert!(!erased.needs_infer(), "{:?}", erased);
41+
erased
3642
}
3743
Err(NoSolution) => bug!("could not fully normalize `{:?}`", value),
3844
}

0 commit comments

Comments
 (0)