From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 12 Jun 2024 07:43:14 +0200
Subject: Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 js/src/builtin/AtomicsObject.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'js/src/builtin/AtomicsObject.cpp')

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;
           }
-- 
cgit v1.2.3