Fix fn_sig_for_fn_abi and the coroutine transform for generators
There were three issues previously: * The self argument was pinned, despite Iterator::next taking an unpinned mutable reference. * A resume argument was passed, despite Iterator::next not having one. * The return value was CoroutineState<Item, ()> rather than Option<Item> While these things just so happened to work with the LLVM backend, cg_clif does much stricter checks when trying to assign a value to a place. In addition it can't handle the mismatch between the amount of arguments specified by the FnAbi and the FnSig.
This commit is contained in:
parent
dfc669b74c
commit
4ae658683f
@ -100,6 +100,15 @@ const fn jit_bin(config: &'static str, source: &'static str, args: &'static str)
|
|||||||
TestCase::build_bin_and_run("aot.issue-72793", "example/issue-72793.rs", &[]),
|
TestCase::build_bin_and_run("aot.issue-72793", "example/issue-72793.rs", &[]),
|
||||||
TestCase::build_bin("aot.issue-59326", "example/issue-59326.rs"),
|
TestCase::build_bin("aot.issue-59326", "example/issue-59326.rs"),
|
||||||
TestCase::build_bin_and_run("aot.neon", "example/neon.rs", &[]),
|
TestCase::build_bin_and_run("aot.neon", "example/neon.rs", &[]),
|
||||||
|
TestCase::custom("aot.gen_block_iterate", &|runner| {
|
||||||
|
runner.run_rustc([
|
||||||
|
"example/gen_block_iterate.rs",
|
||||||
|
"--edition",
|
||||||
|
"2024",
|
||||||
|
"-Zunstable-options",
|
||||||
|
]);
|
||||||
|
runner.run_out_command("gen_block_iterate", &[]);
|
||||||
|
}),
|
||||||
];
|
];
|
||||||
|
|
||||||
pub(crate) static RAND_REPO: GitRepo = GitRepo::github(
|
pub(crate) static RAND_REPO: GitRepo = GitRepo::github(
|
||||||
|
@ -43,6 +43,7 @@ aot.mod_bench
|
|||||||
aot.issue-72793
|
aot.issue-72793
|
||||||
aot.issue-59326
|
aot.issue-59326
|
||||||
aot.neon
|
aot.neon
|
||||||
|
aot.gen_block_iterate
|
||||||
|
|
||||||
testsuite.extended_sysroot
|
testsuite.extended_sysroot
|
||||||
test.rust-random/rand
|
test.rust-random/rand
|
||||||
|
36
example/gen_block_iterate.rs
Normal file
36
example/gen_block_iterate.rs
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
// Copied from https://github.com/rust-lang/rust/blob/46455dc65069387f2dc46612f13fd45452ab301a/tests/ui/coroutine/gen_block_iterate.rs
|
||||||
|
// revisions: next old
|
||||||
|
//compile-flags: --edition 2024 -Zunstable-options
|
||||||
|
//[next] compile-flags: -Ztrait-solver=next
|
||||||
|
// run-pass
|
||||||
|
#![feature(gen_blocks)]
|
||||||
|
|
||||||
|
fn foo() -> impl Iterator<Item = u32> {
|
||||||
|
gen { yield 42; for x in 3..6 { yield x } }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn moved() -> impl Iterator<Item = u32> {
|
||||||
|
let mut x = "foo".to_string();
|
||||||
|
gen move {
|
||||||
|
yield 42;
|
||||||
|
if x == "foo" { return }
|
||||||
|
x.clear();
|
||||||
|
for x in 3..6 { yield x }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let mut iter = foo();
|
||||||
|
assert_eq!(iter.next(), Some(42));
|
||||||
|
assert_eq!(iter.next(), Some(3));
|
||||||
|
assert_eq!(iter.next(), Some(4));
|
||||||
|
assert_eq!(iter.next(), Some(5));
|
||||||
|
assert_eq!(iter.next(), None);
|
||||||
|
// `gen` blocks are fused
|
||||||
|
assert_eq!(iter.next(), None);
|
||||||
|
|
||||||
|
let mut iter = moved();
|
||||||
|
assert_eq!(iter.next(), Some(42));
|
||||||
|
assert_eq!(iter.next(), None);
|
||||||
|
|
||||||
|
}
|
@ -1,4 +1,7 @@
|
|||||||
ignore = ["y.rs"]
|
ignore = [
|
||||||
|
"y.rs",
|
||||||
|
"example/gen_block_iterate.rs", # uses edition 2024
|
||||||
|
]
|
||||||
|
|
||||||
# Matches rustfmt.toml of rustc
|
# Matches rustfmt.toml of rustc
|
||||||
version = "Two"
|
version = "Two"
|
||||||
|
Loading…
Reference in New Issue
Block a user