From 607bddac960981221d80d6b705355960517d593b Mon Sep 17 00:00:00 2001
From: Hendiadyoin1 <leon2002.la@gmail.com>
Date: Sun, 22 Aug 2021 16:30:03 +0200
Subject: [PATCH] AK: Use explode_byte for pointer sanitization

---
 AK/NonnullOwnPtr.h | 5 +----
 AK/NonnullRefPtr.h | 5 +----
 AK/OwnPtr.h        | 5 +----
 AK/RefPtr.h        | 5 +----
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/AK/NonnullOwnPtr.h b/AK/NonnullOwnPtr.h
index 00cf91f1cb..6c781c352b 100644
--- a/AK/NonnullOwnPtr.h
+++ b/AK/NonnullOwnPtr.h
@@ -51,10 +51,7 @@ public:
     {
         clear();
 #ifdef SANITIZE_PTRS
-        if constexpr (sizeof(T*) == 8)
-            m_ptr = (T*)(0xe3e3e3e3e3e3e3e3);
-        else
-            m_ptr = (T*)(0xe3e3e3e3);
+        m_ptr = (T*)(explode_byte(0xe3));
 #endif
     }
 
diff --git a/AK/NonnullRefPtr.h b/AK/NonnullRefPtr.h
index 7eb4b1e628..b38b6528f5 100644
--- a/AK/NonnullRefPtr.h
+++ b/AK/NonnullRefPtr.h
@@ -95,10 +95,7 @@ public:
     {
         assign(nullptr);
 #ifdef SANITIZE_PTRS
-        if constexpr (sizeof(T*) == 8)
-            m_bits.store(0xb0b0b0b0b0b0b0b0, AK::MemoryOrder::memory_order_relaxed);
-        else
-            m_bits.store(0xb0b0b0b0, AK::MemoryOrder::memory_order_relaxed);
+        m_bits.store(explode_byte(0xb0), AK::MemoryOrder::memory_order_relaxed);
 #endif
     }
 
diff --git a/AK/OwnPtr.h b/AK/OwnPtr.h
index 51e42db882..4cca9e95b0 100644
--- a/AK/OwnPtr.h
+++ b/AK/OwnPtr.h
@@ -43,10 +43,7 @@ public:
     {
         clear();
 #ifdef SANITIZE_PTRS
-        if constexpr (sizeof(T*) == 8)
-            m_ptr = (T*)(0xe1e1e1e1e1e1e1e1);
-        else
-            m_ptr = (T*)(0xe1e1e1e1);
+        m_ptr = (T*)(explode_byte(0xe1));
 #endif
     }
 
diff --git a/AK/RefPtr.h b/AK/RefPtr.h
index ea7fa22fea..d5b17c3b2b 100644
--- a/AK/RefPtr.h
+++ b/AK/RefPtr.h
@@ -182,10 +182,7 @@ public:
     {
         clear();
 #ifdef SANITIZE_PTRS
-        if constexpr (sizeof(T*) == 8)
-            m_bits.store(0xe0e0e0e0e0e0e0e0, AK::MemoryOrder::memory_order_relaxed);
-        else
-            m_bits.store(0xe0e0e0e0, AK::MemoryOrder::memory_order_relaxed);
+        m_bits.store(explode_byte(0xe0), AK::MemoryOrder::memory_order_relaxed);
 #endif
     }