diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
| commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
| tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /js/src/builtin/AtomicsObject.cpp | |
| parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
| download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip | |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'js/src/builtin/AtomicsObject.cpp')
| -rw-r--r-- | js/src/builtin/AtomicsObject.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/src/builtin/AtomicsObject.cpp b/js/src/builtin/AtomicsObject.cpp index c4a221aab8..232108872c 100644 --- a/js/src/builtin/AtomicsObject.cpp +++ b/js/src/builtin/AtomicsObject.cpp @@ -280,6 +280,7 @@ bool AtomicAccess(JSContext* cx, HandleValue obj, HandleValue index, Op op) { return op(ArrayOps<int64_t>{}, unwrappedTypedArray, intIndex); case Scalar::BigUint64: return op(ArrayOps<uint64_t>{}, unwrappedTypedArray, intIndex); + case Scalar::Float16: case Scalar::Float32: case Scalar::Float64: case Scalar::Uint8Clamped: @@ -931,7 +932,7 @@ FutexThread::WaitResult js::FutexThread::wait( // See explanation below. if (state_ == WaitingInterrupted) { - UnlockGuard<Mutex> unlock(locked); + UnlockGuard unlock(locked); JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, JSMSG_ATOMICS_WAIT_NOT_ALLOWED); return WaitResult::Error; @@ -1032,7 +1033,7 @@ FutexThread::WaitResult js::FutexThread::wait( state_ = WaitingInterrupted; { - UnlockGuard<Mutex> unlock(locked); + UnlockGuard unlock(locked); if (!cx->handleInterrupt()) { return WaitResult::Error; } |