[PATCH] Fix objc/29197: ICE after error with array type with undefined variable

[PATCH] Fix objc/29197: ICE after error with array type with undefined variable

[Andrew Pinski]

[-- Attachment #1: Type: text/plain, Size: 517 bytes --]

Hi,
  The problem here is that encode_type and objc_push_parm don't handle
error_mark_node that well.  This fixes that problem by having them
handle it.

OK?  Bootstrapped and tested on i686-linux-gnu with no regressions.
Note I originally wrote this patch about a year and half ago and it
still solves the ICE.

Thanks,
Andrew Pinski

ChangeLog:
* objc-act.c (encode_type): Handle when type is error_mark_node.
(objc_push_parm): Handle when the type of parm is error_mark_node.

* objc.dg/method-20.m: New testcase.

[-- Attachment #2: fixpr29197.diff.txt --]
[-- Type: text/plain, Size: 1192 bytes --]

Index: objc/objc-act.c
===================================================================
--- objc/objc-act.c	(revision 133459)
+++ objc/objc-act.c	(working copy)
@@ -8075,6 +8075,9 @@ encode_type (tree type, int curtype, int
   enum tree_code code = TREE_CODE (type);
   char c;
 
+  if (type == error_mark_node)
+    return;
+
   if (TYPE_READONLY (type))
     obstack_1grow (&util_obstack, 'r');
 
@@ -8231,6 +8234,13 @@ static void
 objc_push_parm (tree parm)
 {
   bool relayout_needed = false;
+
+  if (TREE_TYPE (parm) == error_mark_node)
+    {
+      objc_parmlist = chainon (objc_parmlist, parm);
+      return;
+    }
+
   /* Decay arrays and functions into pointers.  */
   if (TREE_CODE (TREE_TYPE (parm)) == ARRAY_TYPE)
     {
Index: testsuite/objc.dg/method-20.m
===================================================================
--- testsuite/objc.dg/method-20.m	(revision 0)
+++ testsuite/objc.dg/method-20.m	(revision 0)
@@ -0,0 +1,8 @@
+/* { dg-do compile }  */
+
+/* We used to crash after we found the type for int[m] was declared as invalid. */
+/* PR objc/29197 */
+
+@ implementation NGActiveSocket
++ (void) socketPair:(int[m]) _pair {} /* { dg-error "" } */
+@end

Re: [PATCH] Fix objc/29197: ICE after error with array type with undefined variable

[Stan Shebs]

Andrew Pinski wrote:
> Hi,
>   The problem here is that encode_type and objc_push_parm don't handle
> error_mark_node that well.  This fixes that problem by having them
> handle it.
>
> OK?  Bootstrapped and tested on i686-linux-gnu with no regressions.
> Note I originally wrote this patch about a year and half ago and it
> still solves the ICE.
>   
This is fine, thanks!

Stan