[cpp23] Remove usage of std::aligned_union<> in llvm (#135146)

victorvianna · web-flow · commit 90a202f2ff24 · 2025-04-11T16:16:33.000-04:00
std::aligned_union<> is deprecated in C++23. See more details in the linked bug. Bug: https://crbug.com/388068052
diff --git a/compiler-rt/lib/orc/error.h b/compiler-rt/lib/orc/error.h
@@ -367,8 +367,8 @@ template <typename T> class ORC_RT_NODISCARD Expected {
   }
 
   union {
-    std::aligned_union_t<1, storage_type> TStorage;
-    std::aligned_union_t<1, error_type> ErrorStorage;
+    alignas(storage_type) char TStorage[sizeof(storage_type)];
+    alignas(error_type) char ErrorStorage[sizeof(error_type)];
   };
 
   bool HasError : 1;
diff --git a/llvm/include/llvm/ADT/TrieRawHashMap.h b/llvm/include/llvm/ADT/TrieRawHashMap.h
@@ -72,7 +72,7 @@ class ThreadSafeTrieRawHashMapBase {
 private:
   template <class T> struct AllocValueType {
     char Base[TrieContentBaseSize];
-    std::aligned_union_t<sizeof(T), T> Content;
+    alignas(T) char Content[sizeof(T)];
   };
 
 protected:

Original file line number	Diff line number	Diff line change
`@@ -367,8 +367,8 @@ template <typename T> class ORC_RT_NODISCARD Expected {`
`367`	`367`	`}`
`368`	`368`
`369`	`369`	`union {`
`370`		`- std::aligned_union_t<1, storage_type> TStorage;`
`371`		`- std::aligned_union_t<1, error_type> ErrorStorage;`
	`370`	`+ alignas(storage_type) char TStorage[sizeof(storage_type)];`
	`371`	`+ alignas(error_type) char ErrorStorage[sizeof(error_type)];`
`372`	`372`	`};`
`373`	`373`
`374`	`374`	`bool HasError : 1;`