[llvm-branch-commits] [llvm-gcc-branch] r92767 - in /llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/cp: ChangeLog.apple parser.c

[Jim Grosbach]

Author: grosbach
Date: Tue Jan  5 14:56:28 2010
New Revision: 92767

URL: http://llvm.org/viewvc/llvm-project?rev=92767&view=rev
Log:
merge 92764

Modified:
    llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/cp/ChangeLog.apple
    llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/cp/parser.c

Modified: llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/cp/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/cp/ChangeLog.apple?rev=92767&r1=92766&r2=92767&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/cp/ChangeLog.apple (original)
+++ llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/cp/ChangeLog.apple Tue Jan  5 14:56:28 2010
@@ -1,3 +1,9 @@
+2010-01-05  Jim Grosbach <grosbach at apple.com>
+
+	Radar 7496972
+	* parser.c (objc_cp_parser_at_property): Don't warn on weak_import
+	on properties.
+
 2009-06-15  Fariborz Jahanian <fjahanian at apple.com>
 
 	Radar 6936421

Modified: llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/cp/parser.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/cp/parser.c?rev=92767&r1=92766&r2=92767&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/cp/parser.c (original)
+++ llvm-gcc-4.2/branches/Apple/Zoidberg/gcc/cp/parser.c Tue Jan  5 14:56:28 2010
@@ -2819,7 +2819,11 @@
 	/* Consume ')' */
 	cp_lexer_consume_token (parser->lexer);
     }
-    objc_cp_parse_property_decl (parser);
+  /* APPLE LOCAL begin weak_import on property 7496972 */
+  note_objc_property_decl_context ();
+  objc_cp_parse_property_decl (parser);
+  note_end_objc_property_decl_context ();
+  /* APPLE LOCAL end weak_import on property 7496972 */
 }
 /* APPLE LOCAL end C* property (Radar 4436866, 4591909) */