Merge pull request #4447 from swiftwasm/main

[pull] swiftwasm from main

Author: kateinoigakukun

include/swift/Runtime/Atomic.h

@@ -95,14 +95,6 @@ struct aligned_alloc<Alignment_, true> {
     free(ptr);
 #endif
   }
-
-#if defined(_WIN32)
-  // FIXME: why is this even needed?  This is not permitted as per the C++
-  // standrd new.delete.placement (§17.6.3.4).
-  [[nodiscard]] void *operator new(std::size_t size, void *where) noexcept {
-    return ::operator new(size, where);
-  }
-#endif
 };
 
 /// The default implementation for swift::atomic<T>, which just wraps

stdlib/public/runtime/MetadataImpl.h

@@ -51,6 +51,7 @@
 #include "EnumImpl.h"
 
 #include <cstring>
+#include <new>
 #include <type_traits>
 
 namespace swift {
@@ -99,11 +100,11 @@ struct NativeBox {
   }
 
   static T *initializeWithCopy(T *dest, T *src) {
-    return new (dest) T(*src);
+    return ::new (dest) T(*src);
   }
 
   static T *initializeWithTake(T *dest, T *src) {
-    T *result = new (dest) T(std::move(*src));
+    T *result = ::new (dest) T(std::move(*src));
     src->T::~T();
     return result;
   }