Skip to content

[Runtime] Fix swift_retainCount for deiniting objects and BridgeObject tagged values. Make swift_bridgeObjectRetain/Release bail out early for tagged values. #19794

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
Oct 11, 2018
Merged

[Runtime] Fix swift_retainCount for deiniting objects and BridgeObject tagged values. Make swift_bridgeObjectRetain/Release bail out early for tagged values. #19794

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
1 change: 0 additions & 1 deletion stdlib/public/SwiftShims/RefCount.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,6 @@ class RefCounts {
if (bits.hasSideTable())
return bits.getSideTable()->getCount();

assert(!bits.getIsDeiniting()); // FIXME: can we assert this?
return bits.getStrongExtraRefCount() + 1;
}

Expand Down
4 changes: 3 additions & 1 deletion stdlib/public/runtime/HeapObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,9 @@ void swift::swift_nonatomic_release_n(HeapObject *object, uint32_t n) {
}

size_t swift::swift_retainCount(HeapObject *object) {
return object->refCounts.getCount();
if (isValidPointerForNativeRetain(object))
return object->refCounts.getCount();
return 0;
}

size_t swift::swift_unownedRetainCount(HeapObject *object) {
Expand Down
24 changes: 15 additions & 9 deletions stdlib/public/runtime/SwiftObject.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,10 +580,16 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {
static_assert((heap_object_abi::SwiftSpareBitsMask & objectPointerIsObjCBit) ==
objectPointerIsObjCBit,
"isObjC bit not within spare bits");
return (uintptr_t(object) & objectPointerIsObjCBit) != 0 && (uintptr_t(object) & heap_object_abi::BridgeObjectTagBitsMask) == 0;
return (uintptr_t(object) & objectPointerIsObjCBit) != 0
&& (uintptr_t(object) & heap_object_abi::BridgeObjectTagBitsMask) == 0;
}
#endif

/// Return true iff the given BridgeObject is a tagged value.
static bool isBridgeObjectTaggedPointer(void *object) {
return (uintptr_t(object) & heap_object_abi::BridgeObjectTagBitsMask) != 0;
}

// Mask out the spare bits in a bridgeObject, returning the object it
// encodes.
///
Expand All @@ -594,7 +600,7 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {

void *swift::swift_bridgeObjectRetain(void *object) {
#if SWIFT_OBJC_INTEROP
if (isObjCTaggedPointer(object))
if (isObjCTaggedPointer(object) || isBridgeObjectTaggedPointer(object))
return object;
#endif

Expand All @@ -616,7 +622,7 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {
SWIFT_RUNTIME_EXPORT
void *swift::swift_nonatomic_bridgeObjectRetain(void *object) {
#if SWIFT_OBJC_INTEROP
if (isObjCTaggedPointer(object))
if (isObjCTaggedPointer(object) || isBridgeObjectTaggedPointer(object))
return object;
#endif

Expand All @@ -638,7 +644,7 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {
SWIFT_RUNTIME_EXPORT
void swift::swift_bridgeObjectRelease(void *object) {
#if SWIFT_OBJC_INTEROP
if (isObjCTaggedPointer(object))
if (isObjCTaggedPointer(object) || isBridgeObjectTaggedPointer(object))
return;
#endif

Expand All @@ -655,7 +661,7 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {

void swift::swift_nonatomic_bridgeObjectRelease(void *object) {
#if SWIFT_OBJC_INTEROP
if (isObjCTaggedPointer(object))
if (isObjCTaggedPointer(object) || isBridgeObjectTaggedPointer(object))
return;
#endif

Expand All @@ -672,7 +678,7 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {

void *swift::swift_bridgeObjectRetain_n(void *object, int n) {
#if SWIFT_OBJC_INTEROP
if (isObjCTaggedPointer(object))
if (isObjCTaggedPointer(object) || isBridgeObjectTaggedPointer(object))
return object;
#endif

Expand All @@ -695,7 +701,7 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {

void swift::swift_bridgeObjectRelease_n(void *object, int n) {
#if SWIFT_OBJC_INTEROP
if (isObjCTaggedPointer(object))
if (isObjCTaggedPointer(object) || isBridgeObjectTaggedPointer(object))
return;
#endif

Expand All @@ -713,7 +719,7 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {

void *swift::swift_nonatomic_bridgeObjectRetain_n(void *object, int n) {
#if SWIFT_OBJC_INTEROP
if (isObjCTaggedPointer(object))
if (isObjCTaggedPointer(object) || isBridgeObjectTaggedPointer(object))
return object;
#endif

Expand All @@ -736,7 +742,7 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {

void swift::swift_nonatomic_bridgeObjectRelease_n(void *object, int n) {
#if SWIFT_OBJC_INTEROP
if (isObjCTaggedPointer(object))
if (isObjCTaggedPointer(object) || isBridgeObjectTaggedPointer(object))
return;
#endif

Expand Down