[interop][SwiftToCxx] fix aligned allocation refs

Author: hyp

lib/PrintAsClang/PrintAsClang.cpp

@@ -103,7 +103,8 @@ static void writePrologue(raw_ostream &out, ASTContext &ctx,
                "#include <cstddef>\n"
                "#include <cstdbool>\n"
                "#include <cstring>\n";
-        out << "#include <cstdlib>\n";
+        out << "#include <stdlib.h>\n";
+        out << "#if defined(_WIN32)\n#include <malloc.h>\n#endif\n";
       },
       [&] {
         out << "#include <stdint.h>\n"

lib/PrintAsClang/PrintSwiftToClangCoreScaffold.cpp

@@ -120,14 +120,22 @@ static void printTypeMetadataResponseType(SwiftToClangInteropContext &ctx,
 
 static void printOpaqueAllocFee(raw_ostream &os) {
   os << R"text(inline void * _Nonnull opaqueAlloc(size_t size, size_t align) {
+#if defined(_WIN32)
+  void *r = _aligned_malloc(size, align);
+#else
   if (align < sizeof(void *)) align = sizeof(void *);
   void *r = nullptr;
   int res = posix_memalign(&r, align, size);
   (void)res;
+#endif
   return r;
 }
 inline void opaqueFree(void * _Nonnull p) {
+#if defined(_WIN32)
+  _aligned_free(p);
+#else
   free(p);
+#endif
 }
 )text";
 }

test/Interop/SwiftToCxx/core/swift-impl-defs-in-cxx.swift

@@ -52,14 +52,22 @@
 // CHECK-NEXT: #endif
 // CHECK-EMPTY:
 // CHECK-NEXT: inline void * _Nonnull opaqueAlloc(size_t size, size_t align) {
+// CHECK-NEXT: #if defined(_WIN32)
+// CHECK-NEXT:   void *r = _aligned_malloc(size, align);
+// CHECK-NEXT: #else
 // CHECK-NEXT:   if (align < sizeof(void *)) align = sizeof(void *);
 // CHECK-NEXT:   void *r = nullptr;
 // CHECK-NEXT:   int res = posix_memalign(&r, align, size);
 // CHECK-NEXT:   (void)res;
+// CHECK-NEXT: #endif
 // CHECK-NEXT:   return r;
 // CHECK-NEXT: }
 // CHECK-NEXT: inline void opaqueFree(void * _Nonnull p) {
+// CHECK-NEXT: #if defined(_WIN32)
+// CHECK-NEXT:   _aligned_free(p);
+// CHECK-NEXT: #else
 // CHECK-NEXT:   free(p);
+// CHECK-NEXT: #endif
 // CHECK-NEXT: }
 // CHECK-EMPTY:
 // CHECK-NEXT: /// Container for an opaque Swift value, like resilient struct.

test/PrintAsCxx/empty.swift

@@ -29,7 +29,10 @@
 // CHECK-NEXT:  #include <cstddef>
 // CHECK-NEXT:  #include <cstdbool>
 // CHECK-NEXT:  #include <cstring>
-// CHECK-NEXT:  #include <cstdlib>
+// CHECK-NEXT:  #include <stdlib.h>
+// CHECK-NEXT:  #if defined(_WIN32)
+// CHECK-NEXT:  #include <malloc.h>
+// CHECK-NEXT:  #endif
 // CHECK-NEXT:  #else
 // CHECK-NEXT:  #include <stdint.h>
 // CHECK-NEXT:  #include <stddef.h>