diff options
| author |  Abseil Team <absl-team@google.com> | 2019-01-17 09:48:22 -0800 |
|---|---|---|
| committer |  Alex Strelnikov <strel@google.com> | 2019-01-17 14:35:37 -0500 |
| commit | efccc502606bed768e50a6cd5806d8eb13e4e935 (patch) | |
| tree | cfeef235fa41c767f5570453ef86509fdc823aac /absl/synchronization | |
| parent | 5e6a78131f7bd5940218462c07d88cdefdd75dbe (diff) | |
Export of internal Abseil changes.
--
b7d4f72ebb8a052cb2c6dfbfb628200eb64585c5 by CJ Johnson <johnsoncj@google.com>:
`Hash` -> `H` for AbslHashValue in InlinedVector
PiperOrigin-RevId: 229765535
--
ecceb8dc7eb9fe576dd0b8f0e95b5d3c3e92795d by Abseil Team <absl-team@google.com>:
fix ubsan error in Mutex on arm32
PiperOrigin-RevId: 229744897
GitOrigin-RevId: b7d4f72ebb8a052cb2c6dfbfb628200eb64585c5
Change-Id: Ic0fd2252f9838d5fceffc808d05a09a8bc872efc
Diffstat (limited to 'absl/synchronization')
| -rw-r--r-- | absl/synchronization/mutex.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/absl/synchronization/mutex.cc b/absl/synchronization/mutex.cc index f1b42db1..40ab7d22 100644 --- a/absl/synchronization/mutex.cc +++ b/absl/synchronization/mutex.cc @@ -1841,7 +1841,7 @@ static void CheckForMutexCorruption(intptr_t v, const char* label) { // Test for either of two situations that should not occur in v: // kMuWriter and kMuReader // kMuWrWait and !kMuWait - const intptr_t w = v ^ kMuWait; + const uintptr_t w = v ^ kMuWait; // By flipping that bit, we can now test for: // kMuWriter and kMuReader in w // kMuWrWait and kMuWait in w |