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

[Stuart Hastings]

Author: stuart
Date: Fri Aug  6 13:39:21 2010
New Revision: 110461

URL: http://llvm.org/viewvc/llvm-project?rev=110461&view=rev
Log:
Fix ObjC++ implicit setter codegen.  Radar 8264751.  Patch by Fariborz Jahanian!

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

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug  6 13:39:21 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,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104523,104726,105504,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690,106711,107062,107439,107843,108784-108786,109556-109557,109702,110405
+/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,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104523,104726,105504,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690,106711,107062,107439,107843,108784-108786,109556-109557,109702,110043,110250,110405,110459

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/cp/call.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/cp/call.c?rev=110461&r1=110460&r2=110461&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/cp/call.c (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/cp/call.c Fri Aug  6 13:39:21 2010
@@ -4538,6 +4538,10 @@
 
 	/* Take the address of the thing to which we will bind the
 	   reference.  */
+        /* LLVM LOCAL begin 8264751 */
+        if (objc_property_reference_expr(expr))
+          expr = objc_build_property_getter_func_call(expr);
+        /* LLVM LOCAL end 8264751 */
 	expr = build_unary_op (ADDR_EXPR, expr, 1);
 	if (expr == error_mark_node)
 	  return error_mark_node;