constexpr.c (inline_asm_in_constexpr_error): New.

	* constexpr.c (inline_asm_in_constexpr_error): New.
	(cxx_eval_constant_expression) <case ASM_EXPR>: Call it.
	(potential_constant_expression_1) <case ASM_EXPR>: Likewise.

	* g++.dg/cpp2a/inline-asm3.C: New test.

From-SVN: r274210

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f937bf5eb32f5e8ef7a2e21487d86f2e0ea8a0ae..3af901c78ea26ff2dee66d0dcd426b1893ba132c 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2019-08-08  Marek Polacek  <polacek@redhat.com>
+
+       * constexpr.c (inline_asm_in_constexpr_error): New.
+       (cxx_eval_constant_expression) <case ASM_EXPR>: Call it.
+       (potential_constant_expression_1) <case ASM_EXPR>: Likewise.
+
 2019-08-08  Jakub Jelinek  <jakub@redhat.com>
 
        * semantics.c (finish_omp_clauses): For C_ORT_OMP

diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index e86b0789b840b7b34515622d463fc671a52dba18..23f2a027e2f57268e6ca91bd7912ae48f9cc3c55 100644 (file)
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -4411,6 +4411,17 @@ lookup_placeholder (const constexpr_ctx *ctx, bool lval, tree type)
   return ob;
 }
 
+/* Complain about an attempt to evaluate inline assembly.  */
+
+static void
+inline_asm_in_constexpr_error (location_t loc)
+{
+  auto_diagnostic_group d;
+  error_at (loc, "inline assembly is not a constant expression");
+  inform (loc, "only unevaluated inline assembly is allowed in a "
+         "%<constexpr%> function in C++2a");
+}
+
 /* Attempt to reduce the expression T to a constant value.
    On failure, issue diagnostic and return error_mark_node.  */
 /* FIXME unify with c_fully_fold */
@@ -5291,13 +5302,7 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
 
     case ASM_EXPR:
       if (!ctx->quiet)
-       {
-         error_at (cp_expr_loc_or_input_loc (t),
-                   "inline assembly is not a constant expression");
-         inform (cp_expr_loc_or_input_loc (t),
-                 "only unevaluated inline assembly is allowed in a "
-                 "%<constexpr%> function in C++2a");
-       }
+       inline_asm_in_constexpr_error (cp_expr_loc_or_input_loc (t));
       *non_constant_p = true;
       return t;
 
@@ -6488,10 +6493,9 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict, bool now,
       return false;
 
     case ASM_EXPR:
-      /* In C++2a, unevaluated inline assembly is permitted in constexpr
-        functions.  If it's used in earlier standard modes, we pedwarn in
-        cp_parser_asm_definition.  */
-      return true;
+      if (flags & tf_error)
+       inline_asm_in_constexpr_error (loc);
+      return false;
 
     case OBJ_TYPE_REF:
       if (cxx_dialect >= cxx2a)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 685f3731cb7d58d44d491b4e66844a5ebf14c1e0..be085243d370ea343cf195ad1fa170a12c6fd3aa 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-08-08  Marek Polacek  <polacek@redhat.com>
+
+       * g++.dg/cpp2a/inline-asm3.C: New test.
+
 2019-08-07  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/91359

diff --git a/gcc/testsuite/g++.dg/cpp2a/inline-asm3.C b/gcc/testsuite/g++.dg/cpp2a/inline-asm3.C
new file mode 100644 (file)
index 0000000..b636e3b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/inline-asm3.C
@@ -0,0 +1,12 @@
+// P1668R1: Permit unevaluated inline asm in constexpr functions
+// { dg-do compile { target c++2a } }
+// { dg-additional-options "-Wno-pedantic" }
+
+constexpr int
+foo ()
+{
+ constexpr int i = ({ asm(""); 42; }); // { dg-error "inline assembly is not a constant expression" }
+ return i;
+}
+
+constexpr int i = foo ();