BasicBridging: Turn BridgedOptional into a macro

Author: AnthonyLatsis

include/swift/AST/ASTBridgingImpl.h

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2023 Apple Inc. and the Swift project authors
+// Copyright (c) 2023 - 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
@@ -605,7 +605,7 @@ BridgedASTType::MetatypeRepresentation BridgedASTType::getRepresentationOfMetaty
 }
 
 BridgedOptionalInt BridgedASTType::getValueOfIntegerType() const {
-  return BridgedOptionalInt::getFromAPInt(unbridged()->getAs<swift::IntegerType>()->getValue());
+  return getFromAPInt(unbridged()->getAs<swift::IntegerType>()->getValue());
 }
 
 BridgedSubstitutionMap BridgedASTType::getContextSubstitutionMap() const {

include/swift/Basic/BasicBridging.h

@@ -131,6 +131,10 @@ typedef uintptr_t SwiftUInt;
 void assertFail(const char * _Nonnull msg, const char * _Nonnull file,
                 SwiftUInt line, const char * _Nonnull function);
 
+BRIDGED_INLINE
+SWIFT_UNAVAILABLE("Unavailable in Swift")
+void ASSERT_inBridgingHeader(bool condition);
+
 //===----------------------------------------------------------------------===//
 // MARK: ArrayRef
 //===----------------------------------------------------------------------===//
@@ -261,22 +265,42 @@ class BridgedOwnedString {
 } SWIFT_SELF_CONTAINED;
 
 //===----------------------------------------------------------------------===//
-// MARK: BridgedOptionalInt
+// MARK: BridgedOptional
 //===----------------------------------------------------------------------===//
 
-struct BridgedOptionalInt {
-  SwiftInt value;
-  bool hasValue;
+// FIXME: We should be able to make this a template once
+// https://github.com/swiftlang/swift/issues/82258 is fixed.
+#define BRIDGED_OPTIONAL(TYPE, SUFFIX)                                         \
+  class SWIFT_CONFORMS_TO_PROTOCOL(Swift.ExpressibleByNilLiteral)              \
+      BridgedOptional##SUFFIX {                                                \
+    TYPE _value;                                                               \
+    bool _hasValue;                                                            \
+                                                                               \
+  public:                                                                      \
+    SWIFT_NAME("init(nilLiteral:)")                                            \
+    BridgedOptional##SUFFIX(void) : _hasValue(false) {}                        \
+    BridgedOptional##SUFFIX(TYPE value) : _value(value), _hasValue(true) {}    \
+                                                                               \
+    SWIFT_COMPUTED_PROPERTY                                                    \
+    TYPE getValue() const {                                                    \
+      ASSERT_inBridgingHeader(_hasValue);                                      \
+      return _value;                                                           \
+    }                                                                          \
+                                                                               \
+    SWIFT_COMPUTED_PROPERTY                                                    \
+    bool getHasValue() const { return _hasValue; }                             \
+  };
+BRIDGED_OPTIONAL(SwiftInt, Int)
 
 #ifdef USED_IN_CPP_SOURCE
-  static BridgedOptionalInt getFromAPInt(llvm::APInt i) {
-    if (i.getSignificantBits() <= std::min(std::numeric_limits<SwiftInt>::digits, 64)) {
-      return {(SwiftInt)i.getSExtValue(), true};
-    }
-    return {0, false};
+inline BridgedOptionalInt getFromAPInt(llvm::APInt i) {
+  if (i.getSignificantBits() <=
+      std::min(std::numeric_limits<SwiftInt>::digits, 64)) {
+    return {(SwiftInt)i.getSExtValue()};
   }
+  return {};
+}
 #endif
-};
 
 //===----------------------------------------------------------------------===//
 // MARK: OStream

include/swift/Basic/BasicBridgingImpl.h

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2023 Apple Inc. and the Swift project authors
+// Copyright (c) 2023 - 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
@@ -19,6 +19,8 @@
 
 SWIFT_BEGIN_NULLABILITY_ANNOTATIONS
 
+void ASSERT_inBridgingHeader(bool condition) { ASSERT(condition); }
+
 //===----------------------------------------------------------------------===//
 // MARK: BridgedStringRef
 //===----------------------------------------------------------------------===//

include/swift/Basic/SwiftBridging.h

@@ -48,10 +48,29 @@
 #define SWIFT_COMPUTED_PROPERTY                                                \
   __attribute__((swift_attr("import_computed_property")))
 
+#define _CXX_INTEROP_STRINGIFY(_x) #_x
+
+/// Specifies that a specific C++ `class` or `struct` conforms to a
+/// a specific Swift protocol.
+///
+/// This example shows how to use this macro to conform a class template to a
+/// Swift protocol:
+///  ```
+///    template<class T>
+///    class SWIFT_CONFORMS_TO_PROTOCOL(SwiftModule.ProtocolName)
+///    CustomClass {};
+///  ```
+// clang-format off
+#define SWIFT_CONFORMS_TO_PROTOCOL(_moduleName_protocolName)                   \
+  __attribute__((swift_attr(                                                   \
+      _CXX_INTEROP_STRINGIFY(conforms_to:_moduleName_protocolName))))
+// clang-format on
+
 #else // #if __has_attribute(swift_attr)
 
 #define SWIFT_SELF_CONTAINED
 #define SWIFT_COMPUTED_PROPERTY
+#define SWIFT_CONFORMS_TO_PROTOCOL(_moduleName_protocolName)
 
 #endif // #if __has_attribute(swift_attr)
 

include/swift/SIL/SILBridgingImpl.h

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 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
@@ -1176,7 +1176,7 @@ BridgedFunction BridgedInstruction::FunctionRefBaseInst_getReferencedFunction()
 
 BridgedOptionalInt BridgedInstruction::IntegerLiteralInst_getValue() const {
   llvm::APInt result = getAs<swift::IntegerLiteralInst>()->getValue();
-  return BridgedOptionalInt::getFromAPInt(result);
+  return getFromAPInt(result);
 }
 
 BridgedStringRef BridgedInstruction::StringLiteralInst_getValue() const {