diff options
| author | bors <bors@rust-lang.org> | 2024-02-16 16:40:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-16 16:40:45 +0000 |
| commit | d2e8ecd8bd26a22111cdebfb813258450b07fbf0 (patch) | |
| tree | afe320e52e840709dbf49a51d1dee3ecd70b6469 /compiler/rustc_mir_build/src/lints.rs | |
| parent | ae9d7b0c6434b27e4e2effe8f05b16d37e7ef33f (diff) | |
| parent | f82875e2425c565db12643a562e60c0f08b28c87 (diff) | |
| download | rust-d2e8ecd8bd26a22111cdebfb813258450b07fbf0.tar.gz rust-d2e8ecd8bd26a22111cdebfb813258450b07fbf0.zip | |
Auto merge of #121188 - GuillaumeGomez:rollup-bejz7fq, r=GuillaumeGomez
Rollup of 6 pull requests Successful merges: - #119928 (suggest `into_iter()` when `Iterator` method called on `impl IntoIterator`) - #121020 (Avoid an ICE in diagnostics) - #121111 (For E0038, suggest associated type if available) - #121137 (Add clippy into the known `cfg` list) - #121179 (allow mutable references in const values when they point to no memory) - #121181 (Fix an ICE in the recursion lint) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_build/src/lints.rs')
| -rw-r--r-- | compiler/rustc_mir_build/src/lints.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_mir_build/src/lints.rs b/compiler/rustc_mir_build/src/lints.rs index 508936be29d..3f2b7c482a6 100644 --- a/compiler/rustc_mir_build/src/lints.rs +++ b/compiler/rustc_mir_build/src/lints.rs @@ -137,7 +137,9 @@ impl<'tcx> TerminatorClassifier<'tcx> for CallRecursion<'tcx> { let func_ty = func.ty(body, tcx); if let ty::FnDef(callee, args) = *func_ty.kind() { - let normalized_args = tcx.normalize_erasing_regions(param_env, args); + let Ok(normalized_args) = tcx.try_normalize_erasing_regions(param_env, args) else { + return false; + }; let (callee, call_args) = if let Ok(Some(instance)) = Instance::resolve(tcx, param_env, callee, normalized_args) { |