[llvm-branch-commits] [llvm-gcc-branch] r102458 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ gcc/cp/typeck.c

[Bill Wendling]

Author: void
Date: Tue Apr 27 15:22:19 2010
New Revision: 102458

URL: http://llvm.org/viewvc/llvm-project?rev=102458&view=rev
Log:
$ svn merge -c 102444 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r102444 into '.':
U    gcc/cp/typeck.c


Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/cp/typeck.c

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 27 15:22:19 2010
@@ -1,2 +1,2 @@
 /llvm/trunk:100565
-/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/cp/typeck.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/cp/typeck.c?rev=102458&r1=102457&r2=102458&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/cp/typeck.c (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/cp/typeck.c Tue Apr 27 15:22:19 2010
@@ -7058,7 +7058,7 @@
     {
       /* APPLE LOCAL begin radar 7901648 */
       if (retval == error_mark_node ||
-          retval && TREE_TYPE(retval) == error_mark_node)
+          (retval && TREE_TYPE(retval) == error_mark_node))
         return error_mark_node;
       /* APPLE LOCAL end radar 7901648 */
       /* If this is the first return we've seen in the block, infer the type of