Merge pull request #64389 from hyp/eng/SWIFT_INLINE_PRIVATE_HELPER-macro

[interop][SwiftToCxx] use 'SWIFT_INLINE_PRIVATE_HELPER' macro for sta…

Author: hyp

lib/PrintAsClang/ClangSyntaxPrinter.cpp

@@ -197,6 +197,10 @@ void ClangSyntaxPrinter::printInlineForThunk() const {
   os << "SWIFT_INLINE_THUNK ";
 }
 
+void ClangSyntaxPrinter::printInlineForHelperFunction() const {
+  os << "SWIFT_INLINE_PRIVATE_HELPER ";
+}
+
 void ClangSyntaxPrinter::printNullability(
     Optional<OptionalTypeKind> kind, NullabilityPrintKind printKind) const {
   if (!kind)

lib/PrintAsClang/ClangSyntaxPrinter.h

@@ -154,6 +154,7 @@ class ClangSyntaxPrinter {
   };
 
   void printInlineForThunk() const;
+  void printInlineForHelperFunction() const;
 
   void printNullability(
       Optional<OptionalTypeKind> kind,

lib/PrintAsClang/PrintClangValueType.cpp

@@ -442,7 +442,7 @@ void ClangValueTypePrinter::printValueTypeDecl(
 
         os << "  template<class T>\n";
         os << "  static ";
-        ClangSyntaxPrinter(os).printInlineForThunk();
+        ClangSyntaxPrinter(os).printInlineForHelperFunction();
         printCxxTypeName(os, typeDecl, moduleContext);
         printGenericParamRefs(os);
         os << " returnNewValue(T callable) {\n";

lib/PrintAsClang/_SwiftCxxInteroperability.h

@@ -28,25 +28,31 @@
 # define SWIFT_CALL __attribute__((swiftcall))
 #endif
 
-/// The `SWIFT_INLINE_THUNK` macro is applied on the inline function thunks in
-/// the header that represents a C/C++ Swift module interface generated by the
-/// Swift compiler.
 #if __has_attribute(always_inline) && __has_attribute(nodebug)
+#define SWIFT_INLINE_THUNK_ATTRIBUTES                                          \
+  __attribute__((always_inline)) __attribute__((nodebug))
 #if defined(DEBUG) && __has_attribute(used)
 // Additional 'used' attribute is used in debug mode to make inline thunks
 // accessible to LLDB.
-#define SWIFT_INLINE_THUNK_ATTRIBUTES                                          \
-  __attribute__((always_inline)) __attribute__((nodebug))                   \
-  __attribute__((used))
+#define SWIFT_INLINE_THUNK_USED_ATTRIBUTE __attribute__((used))
 #else
-#define SWIFT_INLINE_THUNK_ATTRIBUTES                                          \
-  __attribute__((always_inline)) __attribute__((nodebug))
+#define SWIFT_INLINE_THUNK_USED_ATTRIBUTE
 #endif
 #else
 #define SWIFT_INLINE_THUNK_ATTRIBUTES
+#define SWIFT_INLINE_THUNK_USED_ATTRIBUTE
 #endif
 
-#define SWIFT_INLINE_THUNK inline SWIFT_INLINE_THUNK_ATTRIBUTES
+/// The `SWIFT_INLINE_THUNK` macro is applied on the inline function thunks in
+/// the header that represents a C/C++ Swift module interface generated by the
+/// Swift compiler.
+#define SWIFT_INLINE_THUNK                                                     \
+  inline SWIFT_INLINE_THUNK_ATTRIBUTES SWIFT_INLINE_THUNK_USED_ATTRIBUTE
+
+/// The `SWIFT_INLINE_PRIVATE_HELPER` macro is applied on the helper / utility
+/// functions in the header that represents a C/C++ Swift module interface
+/// generated by the Swift compiler.
+#define SWIFT_INLINE_PRIVATE_HELPER inline SWIFT_INLINE_THUNK_ATTRIBUTES
 
 /// The `SWIFT_SYMBOL_MODULE` and `SWIFT_SYMBOL_MODULE_USR` macros apply
 /// `external_source_symbol` Clang attributes to C++ declarations that represent

test/Interop/SwiftToCxx/generics/generic-struct-in-cxx.swift

@@ -255,7 +255,7 @@ public func inoutConcretePair(_ x: UInt16, _ y: inout GenericPair<UInt16, UInt16
 // CHECK-NEXT:   static SWIFT_INLINE_THUNK char * _Nonnull getOpaquePointer(GenericPair<T_0_0, T_0_1> &object) { return object._getOpaquePointer(); }
 // CHECK-NEXT:   static SWIFT_INLINE_THUNK const char * _Nonnull getOpaquePointer(const GenericPair<T_0_0, T_0_1> &object) { return object._getOpaquePointer(); }
 // CHECK-NEXT: template<class T>
-// CHECK-NEXT: static SWIFT_INLINE_THUNK GenericPair<T_0_0, T_0_1> returnNewValue(T callable) {
+// CHECK-NEXT: static SWIFT_INLINE_PRIVATE_HELPER GenericPair<T_0_0, T_0_1> returnNewValue(T callable) {
 // CHECK-NEXT:   auto result = GenericPair<T_0_0, T_0_1>::_make();
 // CHECK-NEXT:   callable(result._getOpaquePointer());
 // CHECK-NEXT:   return result;

test/Interop/SwiftToCxx/stdlib/swift-stdlib-in-cxx.swift

@@ -3,6 +3,7 @@
 // RUN: %FileCheck %s < %t/Swift.h
 
 // RUN: %check-interop-cxx-header-in-clang(%t/Swift.h -DSWIFT_CXX_INTEROP_HIDE_STL_OVERLAY -Wno-unused-private-field -Wno-unused-function -Wc++98-compat-extra-semi)
+// RUN: %check-interop-cxx-header-in-clang(%t/Swift.h -DSWIFT_CXX_INTEROP_HIDE_STL_OVERLAY -Wno-unused-private-field -Wno-unused-function -Wc++98-compat-extra-semi -DDEBUG=1)
 
 // CHECK: namespace swift SWIFT_PRIVATE_ATTR SWIFT_SYMBOL_MODULE("swift") {
 

test/Interop/SwiftToCxx/structs/swift-struct-in-cxx.swift

@@ -64,7 +64,7 @@
 // CHECK-NEXT: static SWIFT_INLINE_THUNK char *  _Nonnull getOpaquePointer(StructWithIntField &object) { return object._getOpaquePointer(); }
 // CHECK-NEXT: static SWIFT_INLINE_THUNK const char * _Nonnull getOpaquePointer(const StructWithIntField &object) { return object._getOpaquePointer(); }
 // CHECK-NEXT: template<class T>
-// CHECK-NEXT: static SWIFT_INLINE_THUNK StructWithIntField returnNewValue(T callable) {
+// CHECK-NEXT: static SWIFT_INLINE_PRIVATE_HELPER StructWithIntField returnNewValue(T callable) {
 // CHECK-NEXT:   auto result = StructWithIntField::_make();
 // CHECK-NEXT:   callable(result._getOpaquePointer());
 // CHECK-NEXT:   return result;