Skip to content

[6.2][cxx-interop] Properly support OS objects in reverse interop #84076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 4, 2025
Merged

[6.2][cxx-interop] Properly support OS objects in reverse interop #84076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions lib/PrintAsClang/ClangSyntaxPrinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
//===----------------------------------------------------------------------===//

#include "ClangSyntaxPrinter.h"
#include "DeclAndTypePrinter.h"
#include "PrimitiveTypeMapping.h"
#include "swift/ABI/MetadataValues.h"
#include "swift/AST/ASTContext.h"
Expand Down Expand Up @@ -99,6 +100,12 @@ bool ClangSyntaxPrinter::printNominalTypeOutsideMemberDeclInnerStaticAssert(
}

void ClangSyntaxPrinter::printClangTypeReference(const clang::Decl *typeDecl) {
StringRef osObjectName = DeclAndTypePrinter::maybeGetOSObjectBaseName(
dyn_cast<clang::NamedDecl>(cast<clang::NamedDecl>(typeDecl)));
if (!osObjectName.empty()) {
os << osObjectName << "_t";
return;
}
if (cast<clang::NamedDecl>(typeDecl)->getDeclName().isEmpty() &&
isa<clang::TagDecl>(typeDecl)) {
if (auto *tnd =
Expand Down
2 changes: 2 additions & 0 deletions lib/PrintAsClang/DeclAndTypePrinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3084,6 +3084,8 @@ const TypeDecl *DeclAndTypePrinter::getObjCTypeDecl(const TypeDecl* TD) {

StringRef
DeclAndTypePrinter::maybeGetOSObjectBaseName(const clang::NamedDecl *decl) {
if (!decl)
return StringRef();
StringRef name = decl->getName();
if (!name.consume_front("OS_"))
return StringRef();
Expand Down
7 changes: 6 additions & 1 deletion lib/PrintAsClang/PrintClangFunction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,11 +320,16 @@ class CFunctionSignatureTypePrinter
auto *cd = CT->getDecl();
if (cd->hasClangNode()) {
const auto *clangDecl = cd->getClangDecl();
ClangSyntaxPrinter(cd->getASTContext(), os).printClangTypeReference(clangDecl);
ClangSyntaxPrinter(cd->getASTContext(), os)
.printClangTypeReference(clangDecl);
bool alreadyPointer = false;
if (const auto *typedefDecl = dyn_cast<clang::TypedefNameDecl>(clangDecl))
if (importer::isCFTypeDecl(typedefDecl))
alreadyPointer = true;
if (!DeclAndTypePrinter::maybeGetOSObjectBaseName(
dyn_cast<clang::NamedDecl>(clangDecl))
.empty())
alreadyPointer = true;
os << (alreadyPointer ? " " : " *")
<< (!optionalKind || *optionalKind == OTK_None ? "_Nonnull"
: "_Nullable");
Expand Down
10 changes: 8 additions & 2 deletions lib/PrintAsClang/PrintClangValueType.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "swift/ClangImporter/ClangImporter.h"
#include "swift/IRGen/IRABIDetailsProvider.h"
#include "swift/IRGen/Linking.h"
#include "clang/AST/Decl.h"
#include "clang/Basic/Module.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/Support/raw_ostream.h"
Expand Down Expand Up @@ -654,8 +655,13 @@ void ClangValueTypePrinter::printTypeGenericTraits(
os << "} // end namespace \n\n";
os << "namespace swift SWIFT_PRIVATE_ATTR {\n";
auto classDecl = dyn_cast<ClassDecl>(typeDecl);
bool addPointer =
typeDecl->isObjC() || (classDecl && classDecl->isForeignReferenceType());

bool isOSObject = false;
if (const auto nd =
dyn_cast_or_null<clang::NamedDecl>(typeDecl->getClangDecl()))
isOSObject = !DeclAndTypePrinter::maybeGetOSObjectBaseName(nd).empty();
bool addPointer = (typeDecl->isObjC() && !isOSObject) ||
(classDecl && classDecl->isForeignReferenceType());

if (objCxxOnly)
os << "#if defined(__OBJC__)\n";
Expand Down
6 changes: 6 additions & 0 deletions test/Interop/SwiftToCxx/stdlib/core-foundation-types-in-cxx.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@
// RUN: %FileCheck %s < %t/UseCoreFoundation.h

// RUN: echo "#include <netinet/in.h>" > %t/full-header.h
// RUN: echo "#include <dispatch/dispatch.h>" >> %t/full-header.h
// RUN: cat %t/UseCoreFoundation.h >> %t/full-header.h
// RUN: %target-interop-build-clangxx -std=gnu++20 -fobjc-arc -c -x objective-c++-header %t/full-header.h -o %t/o.o

// REQUIRES: objc_interop

import CoreFoundation
import Foundation
import Dispatch

public func testDispatch(x: DispatchSemaphore) {}

public func foobar(_ a: CFData) -> Bool {
true
Expand All @@ -33,7 +37,9 @@ public enum MyEnum {
// CHECK: SWIFT_EXTERN bool $s17UseCoreFoundation6foobarySbSo9CFDataRefaF(CFDataRef _Nonnull a) SWIFT_NOEXCEPT SWIFT_CALL; // foobar(_:)
// CHECK: SWIFT_EXTERN CFDateRef _Nullable $s17UseCoreFoundation13returnsCFDateSo0E3RefaSgyF(void) SWIFT_NOEXCEPT SWIFT_CALL; // returnsCFDate()
// CHECK: SWIFT_EXTERN void $s17UseCoreFoundation11takesCFDate1xySo0E3RefaSg_tF(CFDateRef _Nullable x) SWIFT_NOEXCEPT SWIFT_CALL; // takesCFDate(x:)
// CHECK: SWIFT_EXTERN void $s17UseCoreFoundation12testDispatch1xySo21OS_dispatch_semaphoreC_tF(dispatch_semaphore_t _Nonnull x) SWIFT_NOEXCEPT SWIFT_CALL; // testDispatch(x:)

// CHECK: SWIFT_INLINE_THUNK swift::Optional<in_addr> networkThing() noexcept SWIFT_SYMBOL("s:17UseCoreFoundation12networkThingSo7in_addrVSgyF") SWIFT_WARN_UNUSED_RESULT {
// CHECK: SWIFT_INLINE_THUNK CFDateRef _Nullable returnsCFDate() noexcept SWIFT_SYMBOL("s:17UseCoreFoundation13returnsCFDateSo0E3RefaSgyF") SWIFT_WARN_UNUSED_RESULT {
// CHECK: SWIFT_INLINE_THUNK void takesCFDate(CFDateRef _Nullable x) noexcept SWIFT_SYMBOL("s:17UseCoreFoundation11takesCFDate1xySo0E3RefaSg_tF") {
// CHECK: SWIFT_INLINE_THUNK void testDispatch(dispatch_semaphore_t _Nonnull x) noexcept SWIFT_SYMBOL("s:17UseCoreFoundation12testDispatch1xySo21OS_dispatch_semaphoreC_tF") {