OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Take resume argument from the right generator type

Browse Source 
I suppose we could also just put `tcx.mk_unit()` here, but this
works too
This commit is contained in:
Jonas Schievink 2020-02-04 13:52:09 +01:00
parent 72776e6b5d
commit 895aab2263
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/librustc_mir_build/build/mod.rs
View File

@ -83,12 +83,18 @@ fn mir_build(tcx: TyCtxt<'_>, def_id: DefId) -> BodyAndCache<'_> {
abi = Abi::Rust;
vec![ArgInfo(liberated_closure_env_ty(tcx, id, body_id), None, None, None)]
}
ty::Generator(def_id, substs, _) => {
ty::Generator(def_id, _, _) => {
let gen_ty = tcx.body_tables(body_id).node_type(id);
let resume_ty = substs.as_generator().resume_ty(def_id, tcx);
// The resume argument may be missing, in that case we need to provide it here.
if body.params.is_empty() {
let resume_ty = match gen_ty.kind {
ty::Generator(_, substs, _) => {
substs.as_generator().resume_ty(def_id, tcx)
}
_ => bug!(),
};
vec![
ArgInfo(gen_ty, None, None, None),
ArgInfo(resume_ty, None, None, None),