mirror of
https://github.com/rust-lang/rust.git
synced 2026-04-27 18:57:42 +03:00
Auto merge of #140918 - pietroalbini:pa-backport-140902, r=pietroalbini
Backport #140902 to beta This PR backports #140902 to the beta branch, to unblock the stage0 bump. r? `@ghost`
This commit is contained in:
@@ -1924,6 +1924,9 @@ fn async_drop_coroutine_layout(
|
||||
def_id: DefId,
|
||||
args: GenericArgsRef<'tcx>,
|
||||
) -> Option<&'tcx CoroutineLayout<'tcx>> {
|
||||
if args[0].has_placeholders() || args[0].has_non_region_param() {
|
||||
return None;
|
||||
}
|
||||
let instance = InstanceKind::AsyncDropGlue(def_id, Ty::new_coroutine(self, def_id, args));
|
||||
self.mir_shims(instance).coroutine_layout_raw()
|
||||
}
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
//@ compile-flags: -Zmir-enable-passes=+DataflowConstProp
|
||||
//@ edition: 2021
|
||||
//@ build-pass
|
||||
#![feature(async_drop)]
|
||||
#![allow(incomplete_features)]
|
||||
|
||||
use std::mem::ManuallyDrop;
|
||||
use std::{
|
||||
future::async_drop_in_place,
|
||||
pin::{pin, Pin},
|
||||
};
|
||||
fn main() {
|
||||
a(b)
|
||||
}
|
||||
fn b() {}
|
||||
fn a<C>(d: C) {
|
||||
let e = pin!(ManuallyDrop::new(d));
|
||||
let f = unsafe { Pin::map_unchecked_mut(e, |g| &mut **g) };
|
||||
let h = unsafe { async_drop_in_place(f.get_unchecked_mut()) };
|
||||
h;
|
||||
}
|
||||
Reference in New Issue
Block a user