Merge pull request #60285 from hyp/eng/swift-shims-header

hyp · web-flow · commit 6a889c82f05f · 2022-07-29T13:49:41.000+01:00
[interop][SwiftToCxx] add _SwiftCxxInteroperability.h shims header and import it for C++ header mode
diff --git a/lib/PrintAsClang/PrintAsClang.cpp b/lib/PrintAsClang/PrintAsClang.cpp
@@ -105,7 +105,9 @@ static void writePrologue(raw_ostream &out, ASTContext &ctx,
                "#include <cstring>\n";
         out << "#include <stdlib.h>\n";
         out << "#include <new>\n";
-        out << "#if defined(_WIN32)\n#include <malloc.h>\n#endif\n";
+        out << "#if __has_include(<shims/_SwiftCxxInteroperability.h>)\n";
+        out << "#include <shims/_SwiftCxxInteroperability.h>\n";
+        out << "#endif\n";
       },
       [&] {
         out << "#include <stdint.h>\n"
diff --git a/lib/PrintAsClang/PrintSwiftToClangCoreScaffold.cpp b/lib/PrintAsClang/PrintSwiftToClangCoreScaffold.cpp
@@ -154,28 +154,6 @@ static void printTypeMetadataResponseType(SwiftToClangInteropContext &ctx,
                  funcSig.parameterTypes[0]);
 }
 
-static void printOpaqueAllocFee(raw_ostream &os) {
-  os << R"text(inline void * _Nonnull opaqueAlloc(size_t size, size_t align) noexcept {
-#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) noexcept {
-#if defined(_WIN32)
-  _aligned_free(p);
-#else
-  free(p);
-#endif
-}
-)text";
-}
-
 static void printSwiftResilientStorageClass(raw_ostream &os) {
   auto name = cxx_synthesis::getCxxOpaqueStorageClassName();
   static_assert(TargetValueWitnessFlags<uint64_t>::AlignmentMask ==
@@ -302,8 +280,6 @@ void swift::printSwiftToClangCoreScaffold(SwiftToClangInteropContext &ctx,
                                             /*isCForwardDefinition=*/true);
           });
           os << "\n";
-          printOpaqueAllocFee(os);
-          os << "\n";
           printSwiftResilientStorageClass(os);
           printCxxNaiveException(os);
         });
diff --git a/stdlib/public/SwiftShims/CMakeLists.txt b/stdlib/public/SwiftShims/CMakeLists.txt
@@ -22,6 +22,7 @@ set(sources
   UnicodeData.h
   Visibility.h
   _SwiftConcurrency.h
+  _SwiftCxxInteroperability.h
   _SwiftDistributed.h
 
   module.modulemap
diff --git a/stdlib/public/SwiftShims/_SwiftCxxInteroperability.h b/stdlib/public/SwiftShims/_SwiftCxxInteroperability.h
@@ -0,0 +1,56 @@
+//===--- _SwiftCxxInteroperability.h - C++ Interop support ------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2020 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+//  Defines types and support functions required by C++ bindings generated
+//  by the Swift compiler that allow C++ code to call Swift APIs.
+//
+//===----------------------------------------------------------------------===//
+#ifndef SWIFT_CXX_INTEROPERABILITY_H
+#define SWIFT_CXX_INTEROPERABILITY_H
+
+#ifdef __cplusplus
+
+#include <cstdint>
+#include <stdlib.h>
+#if defined(_WIN32)
+#include <malloc.h>
+#endif
+
+namespace swift {
+namespace _impl {
+
+inline void *_Nonnull opaqueAlloc(size_t size, size_t align) noexcept {
+#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) noexcept {
+#if defined(_WIN32)
+  _aligned_free(p);
+#else
+  free(p);
+#endif
+}
+
+} // namespace _impl
+} // namespace swift
+#endif
+
+#endif // SWIFT_CXX_INTEROPERABILITY_H
diff --git a/stdlib/public/SwiftShims/module.modulemap b/stdlib/public/SwiftShims/module.modulemap
@@ -30,3 +30,8 @@ module SwiftOverlayShims {
   header "LibcOverlayShims.h"
   export *
 }
+
+module _SwiftCxxInteropShims {
+  header "_SwiftCxxInteroperability.h"
+  export *
+}
diff --git a/test/Interop/SwiftToCxx/core/swift-impl-defs-in-cxx.swift b/test/Interop/SwiftToCxx/core/swift-impl-defs-in-cxx.swift
@@ -96,25 +96,6 @@
 // CHECK-NEXT: }
 // CHECK-NEXT: #endif
 // CHECK-EMPTY:
-// CHECK-NEXT: inline void * _Nonnull opaqueAlloc(size_t size, size_t align) noexcept {
-// 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) noexcept {
-// 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.
 // CHECK-NEXT: class OpaqueStorage {
 // CHECK-NEXT: public:
diff --git a/test/Interop/lit.local.cfg b/test/Interop/lit.local.cfg
@@ -6,13 +6,14 @@ def get_target_os():
     (run_cpu, run_vendor, run_os, run_version) = re.match('([^-]+)-([^-]+)-([^0-9]+)(.*)', config.variant_triple).groups()
     return run_os
 
-clang_opt = ''
+clang_compile_opt = '-I' + config.swiftlib_dir + ' '
+clang_opt = clang_compile_opt
 
 if get_target_os() in ['windows-msvc']:
     config.substitutions.insert(0, ('%target-abi', 'WIN'))
     # Clang should build object files with link settings equivalent to -libc MD
     # when building for the MSVC target.
-    clang_opt = '-D_MT -D_DLL -Xclang --dependent-lib=msvcrt -Xclang --dependent-lib=oldnames '
+    clang_opt = clang_compile_opt + '-D_MT -D_DLL -Xclang --dependent-lib=msvcrt -Xclang --dependent-lib=oldnames '
 else:
     # FIXME(compnerd) do all the targets we currently support use SysV ABI?
     config.substitutions.insert(0, ('%target-abi', 'SYSV'))
@@ -29,13 +30,13 @@ config.substitutions.insert(0, ('%target-interop-build-clangxx', '%target-clangx
 
 # Test parsing of the generated C++ header in different C++ language modes.
 config.substitutions.insert(0, ('%check-interop-cxx-header-in-clang\(([^)]+)\)',
-                             SubstituteCaptures(r'%check-cxx-header-in-clang -std=c++14 -Wno-padded -Wno-c11-extensions -D_LIBCPP_CSTDLIB \1 && '
-                                                r'%check-cxx-header-in-clang -std=c++17 -Wno-padded -Wno-c11-extensions -D_LIBCPP_CSTDLIB \1 && '
-                                                r'%check-cxx-header-in-clang -std=c++20 -Wno-padded -Wno-c11-extensions -D_LIBCPP_CSTDLIB \1')))
+                             SubstituteCaptures(r'%check-cxx-header-in-clang -std=c++14 -Wno-padded -Wno-c11-extensions -D_LIBCPP_CSTDLIB ' + clang_compile_opt + r'\1 && '
+                                                r'%check-cxx-header-in-clang -std=c++17 -Wno-padded -Wno-c11-extensions -D_LIBCPP_CSTDLIB ' + clang_compile_opt + r'\1 && '
+                                                r'%check-cxx-header-in-clang -std=c++20 -Wno-padded -Wno-c11-extensions -D_LIBCPP_CSTDLIB ' + clang_compile_opt + r'\1')))
 
 # Test parsing of the generated C++ header in different C++ language modes (with C++20 concepts support).
 config.substitutions.insert(0, ('%check-generic-interop-cxx-header-in-clang\(([^)]+)\)',
-                             SubstituteCaptures(r'%check-cxx-header-in-clang -std=c++20 -Wno-padded -Wno-c11-extensions -D_LIBCPP_CSTDLIB \1')))
+                             SubstituteCaptures(r'%check-cxx-header-in-clang -std=c++20 -Wno-padded -Wno-c11-extensions -D_LIBCPP_CSTDLIB ' + clang_compile_opt + r'\1')))
 
 # Test parsing of the generated C header in different C language modes.
 config.substitutions.insert(0, ('%check-interop-c-header-in-clang\(([^)]+)\)',
diff --git a/test/PrintAsCxx/empty.swift b/test/PrintAsCxx/empty.swift
@@ -31,8 +31,8 @@
 // CHECK-NEXT:  #include <cstring>
 // CHECK-NEXT:  #include <stdlib.h>
 // CHECK-NEXT:  #include <new>
-// CHECK-NEXT:  #if defined(_WIN32)
-// CHECK-NEXT:  #include <malloc.h>
+// CHECK-NEXT:  #if __has_include(<shims/_SwiftCxxInteroperability.h>)
+// CHECK-NEXT:  #include <shims/_SwiftCxxInteroperability.h>
 // CHECK-NEXT:  #endif
 // CHECK-NEXT:  #else
 // CHECK-NEXT:  #include <stdint.h>

Original file line number	Diff line number	Diff line change
`@@ -30,3 +30,8 @@ module SwiftOverlayShims {`
`30`	`30`	`header "LibcOverlayShims.h"`
`31`	`31`	`export *`
`32`	`32`	`}`
	`33`	`+`
	`34`	`+module _SwiftCxxInteropShims {`
	`35`	`+ header "_SwiftCxxInteroperability.h"`
	`36`	`+ export *`
	`37`	`+}`