fix type wrapper maybe uninitialized

archonitelabs · Oct 13, 2024 · 79314b5 · 79314b5
1 parent b478350
commit 79314b5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/radiant/TypeTraits.h b/radiant/TypeTraits.h
@@ -37,6 +37,9 @@ using RemoveRef = typename remove_reference<T>::type;
 template <typename T>
 using RemoveCV = typename remove_cv<T>::type;
 
+template <typename T>
+using RemoveCVRef = RemoveCV<RemoveRef<T>>;
+
 template <typename T>
 using RemoveConst = typename remove_const<T>::type;
 

diff --git a/radiant/TypeWrapper.h b/radiant/TypeWrapper.h
@@ -157,6 +157,10 @@ class TypeWrapper<T, false>
 template <typename T>
 class TypeWrapper<T, true>
 {
+private:
+
+    using PointerType = RemoveRef<T>*;
+
 public:
 
     using Type = T;
@@ -165,55 +169,55 @@ class TypeWrapper<T, true>
 
     template <typename U, EnIf<IsCtor<T, U>, int> = 0>
     constexpr explicit TypeWrapper(U&& val) noexcept
-        : m_ref(Forward<U>(val))
+        : m_value(AddrOf(Forward<U>(val)))
     {
     }
 
     template <typename U, EnIf<IsLRefBindable<T, U&>, int> = 0>
     constexpr explicit TypeWrapper(TypeWrapper<U>& r) noexcept
-        : m_ref(r.Get())
+        : m_value(AddrOf(r.Get()))
     {
     }
 
     template <typename U, EnIf<IsLRefBindable<T, const U&>, int> = 0>
     constexpr explicit TypeWrapper(const TypeWrapper<U>& r) noexcept
-        : m_ref(r.Get())
+        : m_value(AddrOf(r.Get()))
     {
     }
 
     template <typename U, EnIf<IsLRefBindable<T, U&>, int> = 0>
     constexpr explicit TypeWrapper(TypeWrapper<U>&& r) noexcept
-        : m_ref(r.Get())
+        : m_value(AddrOf(r.Get()))
     {
     }
 
-    template <typename U, EnIf<IsCtor<T, U>, int> = 0>
+    template <typename U, EnIf<IsLRefBindable<T, U&>, int> = 0>
     constexpr TypeWrapper& operator=(U&& val) noexcept
     {
-        new (this) TypeWrapper(Forward<U>(val));
+        m_value = AddrOf(Forward<U>(val));
         return *this;
     }
 
-    template <typename U, EnIf<IsCtor<T, U&>, int> = 0>
+    template <typename U, EnIf<IsLRefBindable<T, U&>, int> = 0>
     constexpr TypeWrapper& operator=(TypeWrapper<U>& r) noexcept
     {
-        new (this) TypeWrapper(r.Get());
+        m_value = AddrOf(r.Get());
         return *this;
     }
 
     constexpr T& Get() noexcept
     {
-        return m_ref;
+        return *m_value;
     }
 
     constexpr const T& Get() const noexcept
     {
-        return m_ref;
+        return *m_value;
     }
 
 private:
 
-    T m_ref;
+    PointerType m_value;
 };
 
 template <typename T, typename U>

diff --git a/test/test_Result.cpp b/test/test_Result.cpp
@@ -29,11 +29,6 @@
 #include <string>
 #include <utility>
 
-#if !RAD_DBG && defined(RAD_GCC_VERSION)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-
 namespace testnoexcept
 {
 
@@ -3193,7 +3188,3 @@ TEST(ResultTests, CompareRes)
     EXPECT_FALSE(value != rad::ResultErr<MYSTATUS>(MYSTATUS_UNSUCCESSFUL));
     EXPECT_FALSE(rad::ResultErr<MYSTATUS>(MYSTATUS_UNSUCCESSFUL) != value);
 }
-
-#if !RAD_DBG && defined(RAD_GCC_VERSION)
-#pragma GCC diagnostic pop
-#endif
diff --git a/test/test_TypeWrapper.cpp b/test/test_TypeWrapper.cpp
@@ -43,9 +43,11 @@ RAD_S_ASSERT(!noexcept(TW<TO>(rad::DeclVal<TO&>())));
 RAD_S_ASSERT(noexcept(TW<NTO>(rad::DeclVal<NTO&&>())));
 RAD_S_ASSERT(!noexcept(TW<TO>(rad::DeclVal<TO&&>())));
 
+#if RAD_ENABLE_STD
 // noexcept passthrough initializer_list ctor
 RAD_S_ASSERT(noexcept(TW<NTO>({ 1, 2 })));
 RAD_S_ASSERT(!noexcept(TW<TO>({ 1, 2 })));
+#endif
 
 // noexcept passthrough wrapper default copy ctor
 RAD_S_ASSERT(noexcept(TW<NTO>(rad::DeclVal<TW<NTO>&>())));