[llvm-branch-commits] [cfe-branch] r295076 - Merging r294855:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Feb 14 11:35:55 2017
New Revision: 295076

URL: http://llvm.org/viewvc/llvm-project?rev=295076&view=rev
Log:
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.
------------------------------------------------------------------------

Modified:
    cfe/branches/release_40/   (props changed)
    cfe/branches/release_40/docs/AutomaticReferenceCounting.rst
    cfe/branches/release_40/lib/CodeGen/CodeGenModule.h

Propchange: cfe/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 14 11:35:55 2017
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:291850,291853,291865,291871,291877,291879,291881,291907,291955,291963-291964,292032,292052,292183,292194,292247,292265,292497,292555,292558-292559,292561,292590,292800,292847,292874,292991,293043,293134,293360,293369,293596,293678,293787,294008
+/cfe/trunk:291850,291853,291865,291871,291877,291879,291881,291907,291955,291963-291964,292032,292052,292183,292194,292247,292265,292497,292555,292558-292559,292561,292590,292800,292847,292874,292991,293043,293134,293360,293369,293596,293678,293787,294008,294855
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_40/docs/AutomaticReferenceCounting.rst
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/docs/AutomaticReferenceCounting.rst?rev=295076&r1=295075&r2=295076&view=diff
==============================================================================
--- cfe/branches/release_40/docs/AutomaticReferenceCounting.rst (original)
+++ cfe/branches/release_40/docs/AutomaticReferenceCounting.rst Tue Feb 14 11:35:55 2017
@@ -2258,16 +2258,13 @@ non-block type [*]_.  Equivalent to the
 
 .. 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

Modified: cfe/branches/release_40/lib/CodeGen/CodeGenModule.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/lib/CodeGen/CodeGenModule.h?rev=295076&r1=295075&r2=295076&view=diff
==============================================================================
--- cfe/branches/release_40/lib/CodeGen/CodeGenModule.h (original)
+++ cfe/branches/release_40/lib/CodeGen/CodeGenModule.h Tue Feb 14 11:35:55 2017
@@ -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);