refactor: Do not discard try_lock() return value
#26189
Merged
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
Microsoft's C++ Standard Library uses the `[[nodiscard]]` attribute for `try_lock()`. See: https://github.com/microsoft/STL/blob/main/stl/inc/mutex This change allows to drop the current suppression for the warning C4838 and helps to prevent the upcoming warning C4858. See: microsoft/STL@539c26c
|
Friendly ping @ajtowns @ryanofsky @vasild |
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
vasild
approved these changes
Sep 28, 2022
There was a problem hiding this comment.
ACK bff4e06
The old and new code should have identical behavior. The new code is shorter and silences a warning.
https://en.cppreference.com/w/cpp/thread/unique_lock/try_lock
https://en.cppreference.com/w/cpp/thread/unique_lock/owns_lock
The other call to Base::owns_lock() can also be avoided:
EnterCritical(pszName, pszFile, nLine, Base::mutex(), true);
if (!Base::try_lock()) {
LeaveCritical();
return false;
}
return true;Co-authored-by: Vasil Dimov <vd@FreeBSD.org>
|
Updated bff4e06 -> 30cc1c6 (pr26189.01 -> pr26189.02, diff):
|
vasild
approved these changes
Oct 3, 2022
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Oct 4, 2022
30cc1c6 refactor: Drop `owns_lock()` call (Hennadii Stepanov) bff4e06 refactor: Do not discard `try_lock()` return value (Hennadii Stepanov) Pull request description: Microsoft's C++ Standard Library uses the `[[nodiscard]]` attribute for `try_lock()`. See: https://github.com/microsoft/STL/blob/main/stl/inc/mutex This change allows to drop the current suppression for the warning C4838 and helps to prevent the upcoming warning C4858. See: microsoft/STL@539c26c Fixes bitcoin#26017. Split from bitcoin#25819. ACKs for top commit: vasild: ACK 30cc1c6 Tree-SHA512: ce17404e1c78af4f763129753caf8e5a0e1c91ba398778fe912f9fcc56a847e8112460d1a1a35bf905a593b7d8e0b16c6b099ad74976b67dca5f4f3eda6ff621
fanquake
added a commit
to bitcoin-core/gui
that referenced
this pull request
Oct 4, 2022
f3e40c4 build, msvc: Enable C4834 warning (Hennadii Stepanov) Pull request description: Since bitcoin/bitcoin#26189 our codebase is C4834 warning free. See https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/c4834. ACKs for top commit: sipsorcery: tACK f3e40c4. Tree-SHA512: 2dd8fdb5d6c0d4eaf7ffec82039411963010ecea559adfe7e2b5587f467135bd665e0cef5c748e4d6d9ba3c2038d6a5c79980972884adbaaac3bda3b2fbbc408
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Oct 5, 2022
f3e40c4 build, msvc: Enable C4834 warning (Hennadii Stepanov) Pull request description: Since bitcoin#26189 our codebase is C4834 warning free. See https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/c4834. ACKs for top commit: sipsorcery: tACK f3e40c4. Tree-SHA512: 2dd8fdb5d6c0d4eaf7ffec82039411963010ecea559adfe7e2b5587f467135bd665e0cef5c748e4d6d9ba3c2038d6a5c79980972884adbaaac3bda3b2fbbc408
Fabcien
pushed a commit
to Bitcoin-ABC/bitcoin-abc
that referenced
this pull request
Jun 7, 2023
Summary: ``` Microsoft's C++ Standard Library uses the [[nodiscard]] attribute for try_lock(). See: https://github.com/microsoft/STL/blob/main/stl/inc/mutex ``` It appears the same issue occurs with GCC 13.1. Backport of [[bitcoin/bitcoin#26189 | core#26189]]. Test Plan: With debug and GCC 13.1: ninja all check-all It should return no warning. Reviewers: #bitcoin_abc, PiRK Reviewed By: #bitcoin_abc, PiRK Differential Revision: https://reviews.bitcoinabc.org/D14005
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Microsoft's C++ Standard Library uses the
[[nodiscard]]attribute fortry_lock().See: https://github.com/microsoft/STL/blob/main/stl/inc/mutex
This change allows to drop the current suppression for the warning C4838 and helps to prevent the upcoming warning C4858.
See: microsoft/STL@539c26c
Fixes #26017.
Split from #25819.