re PR middle-end/53084 (GCC cannot handle array initialization of string constant...

	PR middle-end/53084
	* varasm.c (compute_reloc_for_constant): Handle ADDR_EXPR
	of MEM_REF.
	(output_addressed_constants): Likewise.

	* gcc.c-torture/execute/pr53084.c: New test.

From-SVN: r186742

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f3992e1b8b2715ec32dcd6cd081e4b935837c3e7..8dbaeffd78002bdcef3f53041c08f54944678e70 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2012-04-24  Jakub Jelinek  <jakub@redhat.com>
 
+       PR middle-end/53084
+       * varasm.c (compute_reloc_for_constant): Handle ADDR_EXPR
+       of MEM_REF.
+       (output_addressed_constants): Likewise.
+
        PR middle-end/52999
        * varasm.c (get_section): Don't ICE for section conflicts with
        built-in section kinds.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8ef28433fd3d5bcf8c0cd167156f8ad289e7b39c..76420e0ebe214ff715f1ca638a0ae839e7b0525c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-24  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/53084
+       * gcc.c-torture/execute/pr53084.c: New test.
+
 2012-04-23  Paolo Carlini  <paolo.carlini@oracle.com>
 
        * g++.dg/cpp0x/noexcept15.C: Adjust for Rev 186726 library changes.

diff --git a/gcc/testsuite/gcc.c-torture/execute/pr53084.c b/gcc/testsuite/gcc.c-torture/execute/pr53084.c
new file mode 100644 (file)
index 0000000..1afc016
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr53084.c
@@ -0,0 +1,18 @@
+/* PR middle-end/53084 */
+
+extern void abort (void);
+
+__attribute__((noinline, noclone)) void
+bar (const char *p)
+{
+  if (p[0] != 'o' || p[1] != 'o' || p[2])
+    abort ();
+}
+
+int
+main ()
+{
+  static const char *const foo[] = {"foo" + 1};
+  bar (foo[0]);
+  return 0;
+}

diff --git a/gcc/varasm.c b/gcc/varasm.c
index b7939c54a848290615594bde74ba74020e9f6528..03ac49b4677d691030919aa41601af82e4095097 100644 (file)
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -3934,6 +3934,13 @@ compute_reloc_for_constant (tree exp)
           tem = TREE_OPERAND (tem, 0))
        ;
 
+      if (TREE_CODE (tem) == MEM_REF
+         && TREE_CODE (TREE_OPERAND (tem, 0)) == ADDR_EXPR)
+       {
+         reloc = compute_reloc_for_constant (TREE_OPERAND (tem, 0));
+         break;
+       }
+
       if (TREE_PUBLIC (tem))
        reloc |= 2;
       else
@@ -4002,6 +4009,9 @@ output_addressed_constants (tree exp)
 
       if (CONSTANT_CLASS_P (tem) || TREE_CODE (tem) == CONSTRUCTOR)
        output_constant_def (tem, 0);
+
+      if (TREE_CODE (tem) == MEM_REF)
+       output_addressed_constants (TREE_OPERAND (tem, 0));
       break;
 
     case PLUS_EXPR: