fix double panic when exceeding the branch limit in Drop
#245
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Eliza Weisman <[email protected]>
Signed-off-by: Eliza Weisman <[email protected]>
Loom will panic if the maximum number of branches is exceeded. If a type's `Drop` impl performs a branch (for example, a `MutexGuard` or `Arc`, or a user-defined type that performs atomic operations in its `Drop` impl), we will hit the assertion a _second_ time, resulting in a double panic. This sucks, because it makes these test failures much harder to debug. This branch fixes the issue by changing the assertion checking path length to also check if the current thread is panicking. If we're already panicking, we don't make the assertion, to avoid causing a double panic. I've added a test that reproduces this double panic, as well. I've also fixed a typo in the assertion message. :)
Darksonn
approved these changes
Dec 4, 2021
hawkw
added a commit
that referenced
this pull request
May 10, 2022
# 0.5.5 (May 10, 2022) ### Added - sync: Add `Arc::from_std` without `T: Sized` bound (#226) - sync: Implement `Debug` for `AtomicPtr` for all `T` (#255) - logs: Add location tracking for threads and atomic operations (#258) - logs: Add additional location tracking to `Arc`, `alloc`, and `mpsc` (#265) - logs: Improve `tracing` configuration for `LOOM_LOG` (#266) - logs: Add a span for the current model's iteration (#267) ### Documented - Add note about in-memory representation of atomic types (#253) - Document `LOOM_LOG` syntax (#257) ### Fixed - Fix double panic when exceeding the branch limit in `Drop` (#245) - cell: Allow using `{Mut,Const}Ptr::{deref,with}` when the pointee is `!Sized` (#247) - thread: Fix semantics of `thread::park` after `Thread::unpark` (#250)
hawkw
added a commit
that referenced
this pull request
May 13, 2022
# 0.5.5 (May 10, 2022) ### Added - sync: Add `Arc::from_std` without `T: Sized` bound (#226) - sync: Implement `Debug` for `AtomicPtr` for all `T` (#255) - logs: Add location tracking for threads and atomic operations (#258) - logs: Add additional location tracking to `Arc`, `alloc`, and `mpsc` (#265) - logs: Improve `tracing` configuration for `LOOM_LOG` (#266) - logs: Add a span for the current model's iteration (#267) ### Documented - Add note about in-memory representation of atomic types (#253) - Document `LOOM_LOG` syntax (#257) ### Fixed - Fix double panic when exceeding the branch limit in `Drop` (#245) - cell: Allow using `{Mut,Const}Ptr::{deref,with}` when the pointee is `!Sized` (#247) - thread: Fix semantics of `thread::park` after `Thread::unpark` (#250)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Loom will panic if the maximum number of branches is exceeded. If a
type's
Dropimpl performs a branch (for example, aMutexGuardorArc, or a user-defined type that performs atomic operations in itsDropimpl), we will hit the assertion a second time, resulting in adouble panic. This sucks, because it makes these test failures much
harder to debug.
This branch fixes the issue by changing the assertion checking path
length to also check if the current thread is panicking. If we're
already panicking, we don't make the assertion, to avoid causing a
double panic. I've added a test that reproduces this double panic, as
well.
I've also fixed a typo in the assertion message. :)
Signed-off-by: Eliza Weisman [email protected]