Remove assert that checks type equality

ouz-a · Mark-Simulacrum · commit 028f3407affc · 2023-09-16T17:55:08.000-04:00
diff --git a/compiler/rustc_codegen_ssa/src/mir/locals.rs b/compiler/rustc_codegen_ssa/src/mir/locals.rs
@@ -7,7 +7,6 @@ use rustc_index::IndexVec;
 use rustc_middle::mir;
 use rustc_middle::ty::print::with_no_trimmed_paths;
 use std::ops::{Index, IndexMut};
-
 pub(super) struct Locals<'tcx, V> {
     values: IndexVec<mir::Local, LocalRef<'tcx, V>>,
 }
@@ -36,17 +35,18 @@ impl<'tcx, V> Locals<'tcx, V> {
 impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
     pub(super) fn initialize_locals(&mut self, values: Vec<LocalRef<'tcx, Bx::Value>>) {
         assert!(self.locals.values.is_empty());
-
+        // FIXME(#115215): After #115025 get's merged this might not be necessary
         for (local, value) in values.into_iter().enumerate() {
             match value {
                 LocalRef::Place(_) | LocalRef::UnsizedPlace(_) | LocalRef::PendingOperand => (),
                 LocalRef::Operand(op) => {
                     let local = mir::Local::from_usize(local);
                     let expected_ty = self.monomorphize(self.mir.local_decls[local].ty);
-                    assert_eq!(expected_ty, op.layout.ty, "unexpected initial operand type");
+                    if expected_ty != op.layout.ty {
+                        warn!("Unexpected initial operand type. See the issues/114858");
+                    }
                 }
             }
-
             self.locals.values.push(value);
         }
     }
diff --git a/tests/ui/codegen/subtyping-enforces-type-equality.rs b/tests/ui/codegen/subtyping-enforces-type-equality.rs
@@ -0,0 +1,48 @@
+// ignore-pass
+// build-pass
+// edition:2021
+use std::future::Future;
+use std::pin::Pin;
+
+type BoxFuture<T> = Pin<Box<dyn Future<Output = T>>>;
+
+fn main() {
+    let _ = wrapper_call(handler);
+}
+
+async fn wrapper_call(handler: impl Handler) {
+    handler.call().await;
+}
+async fn handler() {
+    f(&()).await;
+}
+async fn f<'a>(db: impl Acquire<'a>) {
+    db.acquire().await;
+}
+
+trait Handler {
+    type Future: Future;
+    fn call(self) -> Self::Future;
+}
+
+impl<Fut, F> Handler for F
+where
+    F: Fn() -> Fut,
+    Fut: Future,
+{
+    type Future = Fut;
+    fn call(self) -> Self::Future {
+        loop {}
+    }
+}
+
+trait Acquire<'a> {
+    type Connection;
+    fn acquire(self) -> BoxFuture<Self::Connection>;
+}
+impl<'a> Acquire<'a> for &'a () {
+    type Connection = Self;
+    fn acquire(self) -> BoxFuture<Self> {
+        loop {}
+    }
+}
diff --git a/tests/ui/codegen/subtyping-enforces-type-equality.stderr b/tests/ui/codegen/subtyping-enforces-type-equality.stderr
@@ -0,0 +1 @@
+WARN rustc_codegen_ssa::mir::locals Unexpected initial operand type. See the issues/114858

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ use rustc_index::IndexVec;`
`7`	`7`	`use rustc_middle::mir;`
`8`	`8`	`use rustc_middle::ty::print::with_no_trimmed_paths;`
`9`	`9`	`use std::ops::{Index, IndexMut};`
`10`		`-`
`11`	`10`	`pub(super) struct Locals<'tcx, V> {`
`12`	`11`	`values: IndexVec<mir::Local, LocalRef<'tcx, V>>,`
`13`	`12`	`}`
`@@ -36,17 +35,18 @@ impl<'tcx, V> Locals<'tcx, V> {`
`36`	`35`	`impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {`
`37`	`36`	`pub(super) fn initialize_locals(&mut self, values: Vec<LocalRef<'tcx, Bx::Value>>) {`
`38`	`37`	`assert!(self.locals.values.is_empty());`
`39`		`-`
	`38`	`+ // FIXME(#115215): After #115025 get's merged this might not be necessary`
`40`	`39`	`for (local, value) in values.into_iter().enumerate() {`
`41`	`40`	`match value {`
`42`	`41`	`LocalRef::Place(_) \| LocalRef::UnsizedPlace(_) \| LocalRef::PendingOperand => (),`
`43`	`42`	`LocalRef::Operand(op) => {`
`44`	`43`	`let local = mir::Local::from_usize(local);`
`45`	`44`	`let expected_ty = self.monomorphize(self.mir.local_decls[local].ty);`
`46`		`- assert_eq!(expected_ty, op.layout.ty, "unexpected initial operand type");`
	`45`	`+ if expected_ty != op.layout.ty {`
	`46`	`+ warn!("Unexpected initial operand type. See the issues/114858");`
	`47`	`+ }`
`47`	`48`	`}`
`48`	`49`	`}`
`49`		`-`
`50`	`50`	`self.locals.values.push(value);`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+WARN rustc_codegen_ssa::mir::locals Unexpected initial operand type. See the issues/114858`