Skip to content

[6.0][Runtime] Avoid dlsym of objc_isUniquelyReferenced. #73432

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
May 6, 2024
Merged

[6.0][Runtime] Avoid dlsym of objc_isUniquelyReferenced. #73432

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
9 changes: 6 additions & 3 deletions stdlib/public/runtime/SwiftObject.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
#include <objc/runtime.h>
#include <objc/message.h>
#include <objc/objc.h>
#if __has_include(<objc/objc-internal.h>)
#include <objc/objc-internal.h>
#endif
#endif
#include "llvm/ADT/StringRef.h"
#include "swift/Basic/Lazy.h"
Expand Down Expand Up @@ -1474,11 +1477,11 @@ static bool usesNativeSwiftReferenceCounting_nonNull(
}

#if SWIFT_OBJC_INTEROP
// It would be nice to weak link instead of doing this, but we can't do that
// until the new API is in the versions of libobjc that we're linking against.
static bool isUniquelyReferenced(id object) {
#if OBJC_ISUNIQUELYREFERENCED_DEFINED
return objc_isUniquelyReferenced(object);
if (!SWIFT_RUNTIME_WEAK_CHECK(objc_isUniquelyReferenced))
return false;
return SWIFT_RUNTIME_WEAK_USE(objc_isUniquelyReferenced(object));
#else
auto objcIsUniquelyRefd = SWIFT_LAZY_CONSTANT(reinterpret_cast<bool (*)(id)>(
dlsym(RTLD_NEXT, "objc_isUniquelyReferenced")));
Expand Down