Skip to content

Commit 99d9f43

Browse files
authored
Merge pull request #20309 from compnerd/BO
Runtime: add UnknownObject on non-ObjC builds
2 parents 62a21ac + 5ee3566 commit 99d9f43

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

include/swift/Runtime/BuiltinTypes.def

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ BUILTIN_POINTER_TYPE(Bb, "Builtin.BridgeObject")
5555
BUILTIN_POINTER_TYPE(Bp, "Builtin.RawPointer")
5656
BUILTIN_TYPE(BB, "Builtin.UnsafeValueBuffer")
5757

58-
#if SWIFT_OBJC_INTEROP
5958
BUILTIN_POINTER_TYPE(BO, "Builtin.UnknownObject")
60-
#endif
6159

6260
// Int8 vector types
6361
BUILTIN_VECTOR_TYPE(Bi8_, Int8, 2)

stdlib/public/runtime/KnownMetadata.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ namespace pointer_types {
101101

102102
/// The basic value-witness table for ObjC object pointers.
103103
using BO = ObjCRetainableBox;
104+
#else
105+
using BO = UnknownObjectRetainableBox;
104106
#endif
105107

106108
}

0 commit comments

Comments
 (0)