Skip to content

[scudo] Avoid deprecated-volatile warning in HybridMutex::delayLoop #67135

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

Merged
merged 2 commits into from
Sep 22, 2023
+4 −2
Merged

[scudo] Avoid deprecated-volatile warning in HybridMutex::delayLoop #67135

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6df00a
[scudo] Avoid deprecated-volatile warning in HybridMutex::delayLoop
fabio-d Sep 22, 2023
6196939
Incorporate feedback
fabio-d Sep 22, 2023
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
8 changes: 6 additions & 2 deletions compiler-rt/lib/scudo/standalone/mutex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,13 @@ class CAPABILITY("mutex") HybridMutex {
// are the fastest operations) so that we are unlikely to wait too long for
// fast operations.
constexpr u32 SpinTimes = 16;
volatile u32 V = 0;

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
volatile u32 V;
for (u32 I = 0; I < SpinTimes; ++I)
++V;
V = 0;
Copy link
Contributor

@ChiaHungDuan ChiaHungDuan Sep 22, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you do it like,

        const u32 Tmp = V + 1;
        V = Tmp;

So that we don't need the pragma directive. I'll be replacing the use of volatile later

#pragma GCC diagnostic pop
}

void assertHeldImpl();
Expand Down