Skip to content

Commit 83db71b

Browse files
committed
[interop][SwiftToCxx] use the more appropriate String -> NSString bridging invocation
This fixes some CI failures
1 parent 0312e06 commit 83db71b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

lib/PrintAsClang/PrintClangValueType.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@ static void addCppExtensionsToStdlibType(const NominalTypeDecl *typeDecl,
129129
"return result;\n"
130130
"};\n";
131131
cPrologueOS << "SWIFT_EXTERN void *_Nonnull "
132-
"$sSS23_bridgeToObjectiveCImplyXlyF(swift_interop_stub_"
132+
"$sSS10FoundationE19_bridgeToObjectiveCSo8NSStringCyF(swift_interop_stub_"
133133
"Swift_String) SWIFT_NOEXCEPT SWIFT_CALL;\n";
134134
printer.printObjCBlock([](raw_ostream &os) {
135135
os << " ";
136136
ClangSyntaxPrinter(os).printInlineForThunk();
137137
os << "operator NSString * _Nonnull () const noexcept {\n";
138138
os << " return (__bridge_transfer NSString "
139-
"*)(_impl::$sSS23_bridgeToObjectiveCImplyXlyF(_impl::swift_interop_"
139+
"*)(_impl::$sSS10FoundationE19_bridgeToObjectiveCSo8NSStringCyF(_impl::swift_interop_"
140140
"passDirect_Swift_String(_getOpaquePointer())));\n";
141141
os << " }\n";
142142
});

test/Interop/SwiftToCxx/stdlib/string/string-to-nsstring.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ int main() {
3232
NSString *nsStr = emptyString;
3333
}
3434

35-
// CHECKARC: %[[VAL:.*]] = call swiftcc i8* @"$sSS23_bridgeToObjectiveCImplyXlyF"
35+
// CHECKARC: %[[VAL:.*]] = call swiftcc i8* @"$sSS10FoundationE19_bridgeToObjectiveCSo8NSStringCyF"
3636
// CHECKARC: call i8* @llvm.objc.autorelease(i8* %[[VAL]])
3737
// CHECKARC: @llvm.objc.
3838
// CHECKARC-SAME: autorelease(i8*)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
// CHECK-NEXT: static inline String init();
7878
// CHECK-NEXT: #if defined(__OBJC__)
7979
// CHECK-NEXT: inline __attribute__((always_inline)) operator NSString * _Nonnull () const noexcept {
80-
// CHECK-NEXT: return (__bridge_transfer NSString *)(_impl::$sSS23_bridgeToObjectiveCImplyXlyF(_impl::swift_interop_passDirect_Swift_String(_getOpaquePointer())));
80+
// CHECK-NEXT: return (__bridge_transfer NSString *)(_impl::$sSS10FoundationE19_bridgeToObjectiveCSo8NSStringCyF(_impl::swift_interop_passDirect_Swift_String(_getOpaquePointer())));
8181
// CHECK-NEXT: }
8282
// CHECK-EMPTY:
8383
// CHECK-NEXT: #endif

0 commit comments

Comments
 (0)