gimple-parser.c (c_parser_gimple_postfix_expression): Handle _Literal (char *) &...

2019-07-01  Richard Biener  <rguenther@suse.de>

	c/
	* gimple-parser.c (c_parser_gimple_postfix_expression): Handle
	_Literal (char *) &"foo" for address literals pointing to
	STRING_CSTs.

	* gcc.dg/gimplefe-42.c: New testcase.

From-SVN: r272872

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 83f3eaaa0224e8c05745468369ee9690e298380f..271ed4ba3e90f76814c170dd181e719491754051 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,9 @@
+2019-07-01  Richard Biener  <rguenther@suse.de>
+
+       * gimple-parser.c (c_parser_gimple_postfix_expression): Handle
+       _Literal (char *) &"foo" for address literals pointing to
+       STRING_CSTs.
+
 2019-06-24  Martin Sebor  <msebor@redhat.com>
 
        * c-typeck.c (build_binary_op): Hyphenate floating-point.

diff --git a/gcc/c/gimple-parser.c b/gcc/c/gimple-parser.c
index 275ad911d0867db570e1d14e179d1c50f73b1f79..b2b364cc41a383f54c12cd84666da84665357fac 100644 (file)
--- a/gcc/c/gimple-parser.c
+++ b/gcc/c/gimple-parser.c
@@ -1596,17 +1596,22 @@ c_parser_gimple_postfix_expression (gimple_parser &parser)
                }
              else
                {
-                 bool neg_p;
+                 bool neg_p, addr_p;
                  if ((neg_p = c_parser_next_token_is (parser, CPP_MINUS)))
                    c_parser_consume_token (parser);
+                 if ((addr_p = c_parser_next_token_is (parser, CPP_AND)))
+                   c_parser_consume_token (parser);
                  tree val = c_parser_gimple_postfix_expression (parser).value;
                  if (! val
                      || val == error_mark_node
-                     || ! CONSTANT_CLASS_P (val))
+                     || ! CONSTANT_CLASS_P (val)
+                     || (addr_p && TREE_CODE (val) != STRING_CST))
                    {
                      c_parser_error (parser, "invalid _Literal");
                      return expr;
                    }
+                 if (addr_p)
+                   val = build1 (ADDR_EXPR, type, val);
                  if (neg_p)
                    {
                      val = const_unop (NEGATE_EXPR, TREE_TYPE (val), val);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7e5f38c91134e54206cfed56a906afe9f318c899..ef255f5a312750414ebdf553e31a3cbc971253fb 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-07-01  Richard Biener  <rguenther@suse.de>
+
+       * gcc.dg/gimplefe-42.c: New testcase.
+
 2019-07-01  Hristian Kirtchev  <kirtchev@adacore.com>
 
        * gnat.dg/sets1.adb: Update.

diff --git a/gcc/testsuite/gcc.dg/gimplefe-42.c b/gcc/testsuite/gcc.dg/gimplefe-42.c
new file mode 100644 (file)
index 0000000..b790339
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/gimplefe-42.c
@@ -0,0 +1,18 @@
+/* { dg-do compile } */
+/* { dg-options "-fgimple" } */
+
+typedef char ref_all_char __attribute__((may_alias));
+char a[7];
+__GIMPLE void f()
+{
+  int _1;
+  /* string literals inside __MEM need their address taken.  */
+  __MEM <char[7]> ((ref_all_char *)&a)
+    = __MEM <char[7]> (_Literal (char *) &"654321");
+  /* but plain assignment also works.  */
+  __MEM <char[7]> ((ref_all_char *)&a) = "654321";
+  /* also punning with int.  */
+  _1 = __MEM <int> (_Literal (char *) &"654321");
+  __MEM <int> ((ref_all_char *)&a) = _1;
+  return;
+}