From 0d05ab2ad0cc56cc6fe9ee647dfcfda44a92b4f2 Mon Sep 17 00:00:00 2001
From: Ali Mohammad Pur <ali.mpfard@gmail.com>
Date: Fri, 16 Aug 2024 16:07:17 +0200
Subject: [PATCH] LibWasm: Allow all Value::to<Integral>() calls

This brings back the old behaviour of Value::to<short>() (and other
similar calls), which WASI depends on.
To make sure all similar issues are caught in the future, this commit
also introduces an static assertion in Value::to().
---
 .../LibWasm/AbstractMachine/AbstractMachine.h  | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/Userland/Libraries/LibWasm/AbstractMachine/AbstractMachine.h b/Userland/Libraries/LibWasm/AbstractMachine/AbstractMachine.h
index d27f24548952..0bab4898c800 100644
--- a/Userland/Libraries/LibWasm/AbstractMachine/AbstractMachine.h
+++ b/Userland/Libraries/LibWasm/AbstractMachine/AbstractMachine.h
@@ -142,22 +142,16 @@ class Value {
     template<typename T>
     ALWAYS_INLINE T to() const
     {
+        static_assert(IsOneOf<T, u128, u64, i64, f32, f64, Reference> || IsIntegral<T>, "Unsupported type for Value::to()");
+
         if constexpr (IsSame<T, u128>) {
             return m_value;
         }
-        if constexpr (IsSame<T, u32>) {
-            u32 low = m_value.low() & 0xFFFFFFFF;
-            return low;
-        }
-        if constexpr (IsSame<T, i32>) {
-            u32 low = m_value.low() & 0xFFFFFFFF;
-            return bit_cast<i32>(low);
-        }
-        if constexpr (IsSame<T, u64>) {
-            return bit_cast<u64>(m_value.low());
+        if constexpr (IsOneOf<T, u64, i64>) {
+            return bit_cast<T>(m_value.low());
         }
-        if constexpr (IsSame<T, i64>) {
-            return bit_cast<i64>(m_value.low());
+        if constexpr (IsIntegral<T> && sizeof(T) < 8) {
+            return bit_cast<T>(static_cast<MakeUnsigned<T>>(m_value.low() & NumericLimits<MakeUnsigned<T>>::max()));
         }
         if constexpr (IsSame<T, f32>) {
             u32 low = m_value.low() & 0xFFFFFFFF;