From 0ba7d19769c068729761eba72e779b53101a19bc Mon Sep 17 00:00:00 2001
From: Michael Goulet <michael@errs.io>
Date: Tue, 7 Nov 2023 21:14:38 +0000
Subject: [PATCH] Build pre-coroutine-transform coroutine body
---
compiler/rustc_mir_build/src/build/mod.rs | 12 +-----------
.../ui/mir/build-async-error-body-correctly.rs | 8 ++++++++
.../mir/build-async-error-body-correctly.stderr | 17 +++++++++++++++++
3 files changed, 26 insertions(+), 11 deletions(-)
create mode 100644 tests/ui/mir/build-async-error-body-correctly.rs
create mode 100644 tests/ui/mir/build-async-error-body-correctly.stderr
diff --git a/compiler/rustc_mir_build/src/build/mod.rs b/compiler/rustc_mir_build/src/build/mod.rs
index 7c729016521b0..886d805454db4 100644
--- a/compiler/rustc_mir_build/src/build/mod.rs
+++ b/compiler/rustc_mir_build/src/build/mod.rs
@@ -656,17 +656,7 @@ fn construct_error(tcx: TyCtxt<'_>, def_id: LocalDefId, guar: ErrorGuaranteed) -
let args = args.as_coroutine();
let yield_ty = args.yield_ty();
let return_ty = args.return_ty();
- let self_ty = Ty::new_adt(
- tcx,
- tcx.adt_def(tcx.lang_items().pin_type().unwrap()),
- tcx.mk_args(&[Ty::new_mut_ref(tcx, tcx.lifetimes.re_erased, coroutine_ty).into()]),
- );
- let coroutine_state = Ty::new_adt(
- tcx,
- tcx.adt_def(tcx.lang_items().coroutine_state().unwrap()),
- tcx.mk_args(&[yield_ty.into(), return_ty.into()]),
- );
- (vec![self_ty, args.resume_ty()], coroutine_state, Some(yield_ty))
+ (vec![coroutine_ty, args.resume_ty()], return_ty, Some(yield_ty))
}
dk => bug!("{:?} is not a body: {:?}", def_id, dk),
};
diff --git a/tests/ui/mir/build-async-error-body-correctly.rs b/tests/ui/mir/build-async-error-body-correctly.rs
new file mode 100644
index 0000000000000..1787f80c07e5e
--- /dev/null
+++ b/tests/ui/mir/build-async-error-body-correctly.rs
@@ -0,0 +1,8 @@
+// edition: 2021
+
+async fn asyncfn() {
+ let binding = match true {};
+ //~^ ERROR non-exhaustive patterns: type `bool` is non-empty
+}
+
+fn main() {}
diff --git a/tests/ui/mir/build-async-error-body-correctly.stderr b/tests/ui/mir/build-async-error-body-correctly.stderr
new file mode 100644
index 0000000000000..3d18c249afe21
--- /dev/null
+++ b/tests/ui/mir/build-async-error-body-correctly.stderr
@@ -0,0 +1,17 @@
+error[E0004]: non-exhaustive patterns: type `bool` is non-empty
+ --> $DIR/build-async-error-body-correctly.rs:4:25
+ |
+LL | let binding = match true {};
+ | ^^^^
+ |
+ = note: the matched value is of type `bool`
+help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern as shown
+ |
+LL ~ let binding = match true {
+LL + _ => todo!(),
+LL ~ };
+ |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0004`.