From 65021ec9282c190168e4f364c21d948679bdfaff Mon Sep 17 00:00:00 2001
From: Tyler Mandry <tmandry@gmail.com>
Date: Thu, 13 Jun 2019 15:58:26 -0700
Subject: [PATCH 1/2] Add regression test for #60709

Closes #60709.
---
 src/test/run-pass/async-await/issue-60709.rs | 28 ++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 src/test/run-pass/async-await/issue-60709.rs

diff --git a/src/test/run-pass/async-await/issue-60709.rs b/src/test/run-pass/async-await/issue-60709.rs
new file mode 100644
index 0000000000000..778d3ee0c7083
--- /dev/null
+++ b/src/test/run-pass/async-await/issue-60709.rs
@@ -0,0 +1,28 @@
+// This used to compile the future down to ud2, due to uninhabited types being
+// handled incorrectly in generators.
+// compile-flags: -Copt-level=z -Cdebuginfo=2 --edition=2018
+
+#![feature(async_await, await_macro)]
+#![allow(unused)]
+
+use std::future::Future;
+use std::task::Poll;
+use std::task::Context;
+use std::pin::Pin;
+use std::rc::Rc;
+
+struct Never();
+impl Future for Never {
+    type Output = ();
+    fn poll(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Self::Output> {
+        Poll::Pending
+    }
+}
+
+fn main() {
+    let fut = async {
+        let _rc = Rc::new(()); // Also crashes with Arc
+        await!(Never());
+    };
+    let _bla = fut; // Moving the future is required.
+}

From b7397cc00b052cf49c26b095c72b895cd0a3e254 Mon Sep 17 00:00:00 2001
From: Tyler Mandry <tmandry@gmail.com>
Date: Thu, 13 Jun 2019 17:07:44 -0700
Subject: [PATCH 2/2] Move async-fn-size test to async-await/

---
 src/test/run-pass/{ => async-await}/async-fn-size.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename src/test/run-pass/{ => async-await}/async-fn-size.rs (98%)

diff --git a/src/test/run-pass/async-fn-size.rs b/src/test/run-pass/async-await/async-fn-size.rs
similarity index 98%
rename from src/test/run-pass/async-fn-size.rs
rename to src/test/run-pass/async-await/async-fn-size.rs
index 05afd6d401977..c4e328560ddf7 100644
--- a/src/test/run-pass/async-fn-size.rs
+++ b/src/test/run-pass/async-await/async-fn-size.rs
@@ -1,9 +1,9 @@
 // edition:2018
-// aux-build:arc_wake.rs
 
 #![feature(async_await, await_macro)]
 
-extern crate arc_wake;
+#[path = "../auxiliary/arc_wake.rs"]
+mod arc_wake;
 
 use std::pin::Pin;
 use std::future::Future;