This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] Fix ICE with C compound literals (PR c/48517)


Hi!

On the following testcase build_unary_op ICEs, because
the element type of the array variable (which is TREE_READONLY)
unexpectedly is not TYPE_READONLY.
The problem seems to come from store_init_value, which replaces
the type of the variable with build_distinct_type_copy (TYPE_MAIN_VARIANT (type));
on which it sets TYPE_DOMAIN.  The following patch restores the
quals back.

Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk/4.6?

2011-04-11  Jakub Jelinek  <jakub@redhat.com>

	PR c/48517
	* c-typeck.c (store_init_value): Set TREE_TYPE (decl) to
	qualified type.

	* gcc.dg/pr48517.c: New test.

--- gcc/c-typeck.c.jj	2011-03-31 08:51:03.000000000 +0200
+++ gcc/c-typeck.c	2011-04-11 15:19:25.000000000 +0200
@@ -5773,11 +5773,13 @@ store_init_value (location_t init_loc, t
 	      /* For int foo[] = (int [3]){1}; we need to set array size
 		 now since later on array initializer will be just the
 		 brace enclosed list of the compound literal.  */
+	      tree etype = strip_array_types (TREE_TYPE (decl));
 	      type = build_distinct_type_copy (TYPE_MAIN_VARIANT (type));
-	      TREE_TYPE (decl) = type;
 	      TYPE_DOMAIN (type) = TYPE_DOMAIN (TREE_TYPE (cldecl));
 	      layout_type (type);
 	      layout_decl (cldecl, 0);
+	      TREE_TYPE (decl)
+		= c_build_qualified_type (type, TYPE_QUALS (etype));
 	    }
 	}
     }
--- gcc/testsuite/gcc.dg/pr48517.c.jj	2011-04-11 15:21:59.000000000 +0200
+++ gcc/testsuite/gcc.dg/pr48517.c	2011-04-11 15:21:16.000000000 +0200
@@ -0,0 +1,13 @@
+/* PR c/48517 */
+/* { dg-do compile } */
+/* { dg-options "" } */
+
+void bar (const unsigned short *);
+
+void
+foo (void)
+{
+  static const unsigned short array[] = (const unsigned short []) { 0x0D2B };
+  const unsigned short *ptr = array;
+  bar (ptr);
+}

	Jakub


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]