Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: relax unwind safety requirements #185

Merged
merged 1 commit into from
Sep 27, 2023
Merged

fix: relax unwind safety requirements #185

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions lib/bolero-engine/src/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@ impl<F, G, V> BorrowedGeneratorTest<F, G, V> {
}
}

impl<F: RefUnwindSafe + FnMut(&G::Output) -> Ret, G: RefUnwindSafe + ValueGenerator, Ret> Test
impl<F: RefUnwindSafe + FnMut(&G::Output) -> Ret, G: ValueGenerator, Ret> Test
for BorrowedGeneratorTest<F, G, G::Output>
where
Ret: IntoTestResult,
G::Output: RefUnwindSafe + core::fmt::Debug,
G::Output: core::fmt::Debug,
{
type Value = G::Output;

Expand All @@ -193,10 +193,11 @@ where
input.with_driver(&mut |driver| {
let fun = &mut self.fun;

let value = generate_value!(self, driver);
// The value will not be reused after being captured, so it is unwind safe
let value = core::panic::AssertUnwindSafe(generate_value!(self, driver));

panic::catch(|| {
let res = (fun)(value);
let res = (fun)(*value);
match res.into_test_result() {
Ok(()) => Ok(true),
Err(err) => Err(err),
Expand Down Expand Up @@ -231,11 +232,11 @@ impl<F, G, V> ClonedGeneratorTest<F, G, V> {
}
}

impl<F: RefUnwindSafe + FnMut(G::Output) -> Ret, G: RefUnwindSafe + ValueGenerator, Ret> Test
impl<F: RefUnwindSafe + FnMut(G::Output) -> Ret, G: ValueGenerator, Ret> Test
for ClonedGeneratorTest<F, G, G::Output>
where
Ret: IntoTestResult,
G::Output: RefUnwindSafe + core::fmt::Debug + Clone,
G::Output: core::fmt::Debug + Clone,
{
type Value = G::Output;

Expand All @@ -257,7 +258,11 @@ where
#[cfg(not(kani))]
let input = value.clone();

panic::catch(|| {
// The value will not be reused after being captured, so it is unwind safe
let input = core::panic::AssertUnwindSafe(input);

panic::catch(move || {
let core::panic::AssertUnwindSafe(input) = input;
let res = (fun)(input);
match res.into_test_result() {
Ok(()) => Ok(true),
Expand Down
Loading