re PR objc++/28050 (ICE on invalid initializer)

gcc/
2009-06-22  Steven Bosscher  <steven@gcc.gnu.org>

        PR objc/28050
        * c-parser.c (c_parser_objc_message_args): Return error_mark_node
        instead of NULL if a parser error occurs.

gcc/objc/
2009-06-22  Steven Bosscher  <steven@gcc.gnu.org>

        PR objc/28050
        * objc-act.c (objc_build_message_args): Return if ARGS is the
        error_mark_node.

gcc/testsuite/
2009-06-22  Matthias Klose  <doko@ubuntu.com>

        PR objc/28050
        * pr28050.m: New testcase.

From-SVN: r148804

gcc/ChangeLog

+2009-06-22  Steven Bosscher  <steven@gcc.gnu.org>
+
+	PR objc/28050
+	* c-parser.c (c_parser_objc_message_args): Return error_mark_node
+	instead of NULL if a parser error occurs.
+
 2009-06-22  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
 	* dwarf2out.c (dwarf2_debug_hooks): Initialize
@@ -95,6 +101,7 @@
 	* var-tracking.c: Ditto.
 	* vmsdbgout.c: Ditto.
 
+>>>>>>> .r148803
 2009-06-22  Matthias Klose  <doko@ubuntu.com>
 
 	* Makefile.in (install-plugin): Always use DESTDIR.

gcc/c-parser.c

@@ -6818,7 +6818,7 @@ c_parser_objc_message_args (c_parser *parser)
     {
       tree keywordexpr;
       if (!c_parser_require (parser, CPP_COLON, "expected %<:%>"))
-	return list;
+	return error_mark_node;
       keywordexpr = c_parser_objc_keywordexpr (parser);
       list = chainon (list, build_tree_list (sel, keywordexpr));
       sel = c_parser_objc_selector (parser);

gcc/objc/ChangeLog

+2009-06-22  Steven Bosscher  <steven@gcc.gnu.org>
+
+	PR objc/28050
+	* objc-act.c (objc_build_message_args): Return if ARGS is the
+	error_mark_node.
+	
 2009-06-19  Ian Lance Taylor  <iant@google.com>
 
 	* objc-act.c (objc_in_struct, objc_struct_types): Remove.

gcc/objc/objc-act.c

@@ -6268,7 +6268,7 @@ objc_build_message_expr (tree mess)
 #endif
   tree method_params = NULL_TREE;
 
-  if (TREE_CODE (receiver) == ERROR_MARK)
+  if (TREE_CODE (receiver) == ERROR_MARK || TREE_CODE (args) == ERROR_MARK)
     return error_mark_node;
 
   if (CAN_HAVE_LOCATION_P (receiver))

gcc/testsuite/ChangeLog

+2009-06-22  Matthias Klose  <doko@ubuntu.com>
+
+	PR objc/28050
+	* pr28050.m: New testcase.
+
 2009-06-22  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR testsuite/40481

gcc/testsuite/objc.dg/pr28050.m

+/* { dg-do compile } */
+int i = [0]; /* { dg-error "expected .:. before .\\]. token" } */