Remove const char * support for asm constexpr

asm constexpr now only accepts the same string types as C++26 assert,
e.g. string_view and string. Adjust test suite and documentation.

gcc/cp/ChangeLog:

	* parser.cc (cp_parser_asm_string_expression): Remove support
	for const char * for asm constexpr.

gcc/ChangeLog:

	* doc/extend.texi: Use std::string_view in asm constexpr
	example.

gcc/testsuite/ChangeLog:

	* g++.dg/cpp1z/constexpr-asm-1.C: Use std::std_string_view.
	* g++.dg/cpp1z/constexpr-asm-3.C: Dito.

diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
index de5f0483c12030c60a0cda5bf2e4e5f26c08f8ee..98e8ca10ac4036bd51e1f8eec1b237a12cca71a8 100644 (file)
--- a/gcc/cp/parser.cc
+++ b/gcc/cp/parser.cc
@@ -22852,13 +22852,6 @@ cp_parser_asm_string_expression (cp_parser *parser)
       tree string = cp_parser_constant_expression (parser);
       if (string != error_mark_node)
        string = cxx_constant_value (string, tf_error);
-      if (TREE_CODE (string) == NOP_EXPR)
-       string = TREE_OPERAND (string, 0);
-      if (TREE_CODE (string) == ADDR_EXPR
-         && TREE_CODE (TREE_OPERAND (string, 0)) == STRING_CST)
-       string = TREE_OPERAND (string, 0);
-      if (TREE_CODE (string) == VIEW_CONVERT_EXPR)
-       string = TREE_OPERAND (string, 0);
       cexpr_str cstr (string);
       if (!cstr.type_check (tok->location))
        return error_mark_node;

diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
index 17e26c5004c153e67e623c54c6480840c6fc128d..ee3644a52645f22c30a110408a5e7f8545ca0032 100644 (file)
--- a/gcc/doc/extend.texi
+++ b/gcc/doc/extend.texi
@@ -10716,7 +10716,8 @@ message. Any string is converted to the character set of the source code.
 When this feature is available the @code{__GXX_CONSTEXPR_ASM__} cpp symbol is defined.
 
 @example
-constexpr const char *genfoo() @{ return "foo"; @}
+#include <string>
+constexpr std::string_view genfoo() @{ return "foo"; @}
 
 void function()
 @{

diff --git a/gcc/testsuite/g++.dg/cpp1z/constexpr-asm-1.C b/gcc/testsuite/g++.dg/cpp1z/constexpr-asm-1.C
index 7cc6b37d62083296b7d3adef96ab384d5c1d29a0..311209acb43b220144adbf0d7f54aa90db31e6cb 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp1z/constexpr-asm-1.C
+++ b/gcc/testsuite/g++.dg/cpp1z/constexpr-asm-1.C
@@ -1,22 +1,24 @@
 /* { dg-do compile } */
-/* { dg-options "-std=gnu++11" } */
+/* { dg-options "-std=gnu++17" } */
 
-constexpr const char *genfoo ()
+#include <string>
+
+constexpr std::string_view genfoo ()
 {
   return "foo %1,%0";
 }
 
-constexpr const char *genoutput ()
+constexpr std::string_view genoutput ()
 {
   return "=r";
 }
 
-constexpr const char *geninput ()
+constexpr std::string_view geninput ()
 {
   return "r";
 }
 
-constexpr const char *genclobber ()
+constexpr std::string_view genclobber ()
 {
   return "memory";
 }

diff --git a/gcc/testsuite/g++.dg/cpp1z/constexpr-asm-3.C b/gcc/testsuite/g++.dg/cpp1z/constexpr-asm-3.C
index d33631876bdcaf1ba46ef16f668af516ade1f5ce..ef8a35a0b3baa1661ca47d7a65a45dba42024162 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp1z/constexpr-asm-3.C
+++ b/gcc/testsuite/g++.dg/cpp1z/constexpr-asm-3.C
@@ -1,22 +1,24 @@
 /* { dg-do compile } */
-/* { dg-options "-std=gnu++11" } */
+/* { dg-options "-std=gnu++17" } */
 
-constexpr const char *genfoo ()
+#include <string>
+
+constexpr std::string_view genfoo ()
 {
   return "foo %1,%0";
 }
 
-constexpr const char *genoutput ()
+constexpr std::string_view genoutput ()
 {
   return "=r";
 }
 
-constexpr const char *geninput ()
+constexpr std::string_view geninput ()
 {
   return "r";
 }
 
-constexpr const char *genclobber ()
+constexpr std::string_view genclobber ()
 {
   return "memory";
 }