From 45ffe41d144e3e5bc8993abcbcdd54d870a2ff53 Mon Sep 17 00:00:00 2001
From: Camille GILLOT <gillot.camille@gmail.com>
Date: Mon, 17 Jul 2023 18:55:07 +0000
Subject: [PATCH] Substitute types before checking compatibility.
---
compiler/rustc_mir_transform/src/inline.rs | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/compiler/rustc_mir_transform/src/inline.rs b/compiler/rustc_mir_transform/src/inline.rs
index 7860cf7624796..e08edfe143a44 100644
--- a/compiler/rustc_mir_transform/src/inline.rs
+++ b/compiler/rustc_mir_transform/src/inline.rs
@@ -440,6 +440,10 @@ impl<'tcx> Inliner<'tcx> {
validation: Ok(()),
};
+ for var_debug_info in callee_body.var_debug_info.iter() {
+ checker.visit_var_debug_info(var_debug_info);
+ }
+
// Traverse the MIR manually so we can account for the effects of inlining on the CFG.
let mut work_list = vec![START_BLOCK];
let mut visited = BitSet::new_empty(callee_body.basic_blocks.len());
@@ -847,7 +851,16 @@ impl<'tcx> Visitor<'tcx> for CostChecker<'_, 'tcx> {
if let ProjectionElem::Field(f, ty) = elem {
let parent_ty = place_ref.ty(&self.callee_body.local_decls, self.tcx);
let check_equal = |this: &mut Self, f_ty| {
- if !util::is_equal_up_to_subtyping(this.tcx, this.param_env, ty, f_ty) {
+ // Fast path if there is nothing to substitute.
+ if ty == f_ty {
+ return;
+ }
+ let ty = this.instance.subst_mir(this.tcx, ty::EarlyBinder::bind(&ty));
+ let f_ty = this.instance.subst_mir(this.tcx, ty::EarlyBinder::bind(&f_ty));
+ if ty == f_ty {
+ return;
+ }
+ if !util::is_subtype(this.tcx, this.param_env, ty, f_ty) {
trace!(?ty, ?f_ty);
this.validation = Err("failed to normalize projection type");
return;