Basic, SIL: Include <swift/bridging> when avaiable instead of defining our own macros

Author: AnthonyLatsis

include/swift/Basic/BasicBridging.h

@@ -38,7 +38,7 @@
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 #include "swift/Basic/BridgedSwiftObject.h"
-#include "swift/Basic/Compiler.h"
+#include "swift/Basic/SwiftBridging.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ -55,13 +55,6 @@
 #include <vector>
 #endif
 
-// FIXME: We ought to be importing '<swift/bridging>' instead.
-#if __has_attribute(swift_name)
-#define SWIFT_NAME(NAME) __attribute__((swift_name(NAME)))
-#else
-#define SWIFT_NAME(NAME)
-#endif
-
 #if __has_attribute(availability)
 #define SWIFT_UNAVAILABLE(msg) \
   __attribute__((availability(swift, unavailable, message=msg)))

include/swift/Basic/Compiler.h

@@ -90,13 +90,6 @@
 #define SWIFT_IMPORT_UNSAFE
 #endif
 
-/// Same as `SWIFT_SELF_CONTAINED` in <swift/bridging>.
-#if __has_attribute(swift_attr)
-#define SWIFT_SELF_CONTAINED __attribute__((swift_attr("import_owned")))
-#else
-#define SWIFT_SELF_CONTAINED
-#endif
-
 #ifdef __GNUC__
 #define SWIFT_ATTRIBUTE_NORETURN __attribute__((noreturn))
 #elif defined(_MSC_VER)

include/swift/Basic/SwiftBridging.h

@@ -0,0 +1,61 @@
+//===--- Basic/SwiftBridging.h ----------------------------------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2025 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
+//
+//===----------------------------------------------------------------------===//
+///
+/// This is a wrapper around `<swift/bridging>` that redefines `SWIFT_NAME` to
+/// accept a string literal, and some other macros in case the header is
+/// unavailable (e.g. during bootstrapping). String literals enable us to
+/// properly format the long Swift declaration names that many of our bridging
+/// functions have.
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_BASIC_SWIFT_BRIDGING_H
+#define SWIFT_BASIC_SWIFT_BRIDGING_H
+
+#include "swift/Basic/Compiler.h"
+#if __has_include(<swift/bridging>)
+#include <swift/bridging>
+#else
+
+#if __has_attribute(swift_attr)
+
+/// Specifies that a C++ `class` or `struct` owns and controls the lifetime of
+/// all of the objects it references. Such type should not reference any
+/// objects whose lifetime is controlled externally. This annotation allows
+/// Swift to import methods that return a `class` or `struct` type that is
+/// annotated with this macro.
+#define SWIFT_SELF_CONTAINED __attribute__((swift_attr("import_owned")))
+
+#else // #if __has_attribute(swift_attr)
+
+#define SWIFT_SELF_CONTAINED
+#define SWIFT_COMPUTED_PROPERTY
+
+#endif // #if __has_attribute(swift_attr)
+
+#endif // #if __has_include(<swift/bridging>)
+
+// Redefine SWIFT_NAME.
+#ifdef SWIFT_NAME
+#undef SWIFT_NAME
+#endif
+
+#if __has_attribute(swift_name)
+/// Specifies a name that will be used in Swift for this declaration instead of
+/// its original name.
+#define SWIFT_NAME(_name) __attribute__((swift_name(_name)))
+#else
+#define SWIFT_NAME(_name)
+#endif
+
+#endif // SWIFT_BASIC_SWIFT_BRIDGING_H
+

include/swift/SIL/SILLocation.h

@@ -13,11 +13,12 @@
 #ifndef SWIFT_SIL_LOCATION_H
 #define SWIFT_SIL_LOCATION_H
 
-#include "llvm/ADT/PointerUnion.h"
 #include "swift/AST/ASTNode.h"
+#include "swift/AST/TypeAlignments.h"
 #include "swift/Basic/SourceLoc.h"
+#include "swift/Basic/SwiftBridging.h"
 #include "swift/SIL/SILAllocated.h"
-#include "swift/AST/TypeAlignments.h"
+#include "llvm/ADT/PointerUnion.h"
 
 #include <cstddef>
 #include <type_traits>