averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert the series of commits for removing the return value from swift_retain_noresult.

Browse Source 
I asked that the patches were split up so I could do post commit review.

This reverts commit r32059.
This reverts commit r32058.
This reverts commit r32056.
This reverts commit r32055.

Swift SVN r32060
This commit is contained in:
Michael Gottesman
2015-09-18 02:31:24 +00:00
parent 36f04d1cd6
commit 121ef3ef9f
27 changed files with 369 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
stdlib/public/runtime/HeapObject.cpp
View File

@@ -276,23 +276,29 @@ extern "C" LLVM_LIBRARY_VISIBILITY
void _swift_release_dealloc(HeapObject *object)
__attribute__((noinline,used));
void swift::swift_retain(HeapObject *object) {
SWIFT_RETAIN();
_swift_retain(object);
void
swift::swift_retain_noresult(HeapObject *object) {
swift_retain(object);
}
static void _swift_retain_(HeapObject *object) {
_swift_retain_inlined(object);
HeapObject *swift::swift_retain(HeapObject *object) {
SWIFT_RETAIN();
return _swift_retain(object);
}
static HeapObject *_swift_retain_(HeapObject *object) {
return _swift_retain_inlined(object);
}
auto swift::_swift_retain = _swift_retain_;
void swift::swift_retain_n(HeapObject *object, uint32_t n) {
HeapObject *swift::swift_retain_n(HeapObject *object, uint32_t n) {
SWIFT_RETAIN();
_swift_retain_n(object, n);
return _swift_retain_n(object, n);
}
static void _swift_retain_n_(HeapObject *object, uint32_t n) {
static HeapObject *_swift_retain_n_(HeapObject *object, uint32_t n) {
if (object) {
object->refCount.increment(n);
}
return object;
}
auto swift::_swift_retain_n = _swift_retain_n_;