[llvm-branch-commits] [llvm-gcc-branch] r110691 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ gcc/objc/objc-act.c gcc/testsuite/objc.dg/qualified-id-property.m

[Jim Grosbach]

Author: grosbach
Date: Tue Aug 10 12:28:25 2010
New Revision: 110691

URL: http://llvm.org/viewvc/llvm-project?rev=110691&view=rev
Log:
$ svn merge -c 110689 https://grosbach@llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r110689 into '.':
U    gcc/objc/objc-act.c
A    gcc/testsuite/objc.dg/qualified-id-property.m

Added:
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/testsuite/objc.dg/qualified-id-property.m
      - copied unchanged from r110689, llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/qualified-id-property.m
Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/objc/objc-act.c

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 12:28:25 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,110043,110250,110405,110459,110501
+/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,110501,110689

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/objc/objc-act.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/objc/objc-act.c?rev=110691&r1=110690&r2=110691&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/objc/objc-act.c (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/objc/objc-act.c Tue Aug 10 12:28:25 2010
@@ -1935,6 +1935,23 @@
                 && CLASS_SUPER_NAME (implementation_template))
 	    class = lookup_interface (CLASS_SUPER_NAME (implementation_template));
 	}
+      /* APPLE LOCAL begin radar 8290584 */
+      else {
+        /* receiver could be of type id<protocol,...> find property in 
+           protocol list. */
+        tree rprotos = (TYPE_HAS_OBJC_INFO (TREE_TYPE (rtype))
+                        ? TYPE_OBJC_PROTOCOL_LIST (TREE_TYPE (rtype))
+                        : NULL_TREE);
+        if (rprotos) {
+          x = lookup_property_in_protocol_list (rprotos, property_ident);
+          if (x) {
+            return PROPERTY_SETTER_NAME (x) ? 
+                     IDENTIFIER_POINTER (PROPERTY_SETTER_NAME (x)) :
+                     objc_build_property_setter_name(property_ident, true);
+          }
+        }
+      }
+      /* APPLE LOCAL end radar 8290584 */
     }
   else
     {