From bf0d36c617910427a28bf90911b398437841bd51 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Tue, 14 Feb 2017 17:35:55 +0000 Subject: Merging r294855: ------------------------------------------------------------------------ r294855 | compnerd | 2017-02-11 09:24:09 -0800 (Sat, 11 Feb 2017) | 3 lines docs: update docs for objc_storeStrong behaviour objc_storeStrong does not return a value. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_40@295076 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/AutomaticReferenceCounting.rst | 7 ++----- lib/CodeGen/CodeGenModule.h | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/AutomaticReferenceCounting.rst b/docs/AutomaticReferenceCounting.rst index aa2a28399d..fbd1ba4c4d 100644 --- a/docs/AutomaticReferenceCounting.rst +++ b/docs/AutomaticReferenceCounting.rst @@ -2258,16 +2258,13 @@ non-block type [*]_. Equivalent to the following code: .. code-block:: objc - id objc_storeStrong(id *object, id value) { - value = [value retain]; + void objc_storeStrong(id *object, id value) { id oldValue = *object; + value = [value retain]; *object = value; [oldValue release]; - return value; } -Always returns ``value``. - .. [*] This does not imply that a ``__strong`` object of block type is an invalid argument to this function. Rather it implies that an ``objc_retain`` and not an ``objc_retainBlock`` operation will be emitted if the argument is diff --git a/lib/CodeGen/CodeGenModule.h b/lib/CodeGen/CodeGenModule.h index 1d72b4edeb..36f6785fd1 100644 --- a/lib/CodeGen/CodeGenModule.h +++ b/lib/CodeGen/CodeGenModule.h @@ -166,7 +166,7 @@ struct ObjCEntrypoints { /// void objc_release(id); llvm::Constant *objc_release; - /// id objc_storeStrong(id*, id); + /// void objc_storeStrong(id*, id); llvm::Constant *objc_storeStrong; /// id objc_storeWeak(id*, id); -- cgit v1.2.3