backport: re PR inline-asm/85172 (internal compiler error: unexpected expression...

	Backported from mainline
	2018-04-04  Jakub Jelinek  <jakub@redhat.com>

	PR inline-asm/85172
	* constexpr.c (cxx_eval_builtin_function_call): For calls to
	builtin_valid_in_constant_expr_p functions, don't call
	cxx_eval_constant_expression if argument is not
	potential_constant_expression.

	* g++.dg/ext/builtin13.C: New test.
	* g++.dg/ext/atomic-4.C: New test.

From-SVN: r261947

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 062384e41156e16a3f141b7641c10f05dfdb03cd..a3bec6f431406f4a8bc2e346aad775e58dc87bcc 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,6 +1,14 @@
 2018-06-22  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2018-04-04  Jakub Jelinek  <jakub@redhat.com>
+
+       PR inline-asm/85172
+       * constexpr.c (cxx_eval_builtin_function_call): For calls to
+       builtin_valid_in_constant_expr_p functions, don't call
+       cxx_eval_constant_expression if argument is not
+       potential_constant_expression.
+
        2018-04-03  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/85147

diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 96f8277bdf2eb0b5cfc9536f35371ec7db2046ef..361a955ba01866fc907cb1bf532aac6c276e8cfb 100644 (file)
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -1158,8 +1158,14 @@ cxx_eval_builtin_function_call (const constexpr_ctx *ctx, tree t, tree fun,
   bool dummy1 = false, dummy2 = false;
   for (i = 0; i < nargs; ++i)
     {
-      args[i] = cxx_eval_constant_expression (&new_ctx, CALL_EXPR_ARG (t, i),
-                                             false, &dummy1, &dummy2);
+      args[i] = CALL_EXPR_ARG (t, i);
+      /* If builtin_valid_in_constant_expr_p is true,
+        potential_constant_expression_1 has not recursed into the arguments
+        of the builtin, verify it here.  */
+      if (!builtin_valid_in_constant_expr_p (fun)
+         || potential_constant_expression (args[i]))
+       args[i] = cxx_eval_constant_expression (&new_ctx, args[i], false,
+                                               &dummy1, &dummy2);
       if (bi_const_p)
        /* For __built_in_constant_p, fold all expressions with constant values
           even if they aren't C++ constant-expressions.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ae3c9cb8681ddcaa754b536889114b5be76a20b6..25011ca786d5dd710f347a05faa6ee7c00d5854a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,12 @@
 2018-06-22  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2018-04-04  Jakub Jelinek  <jakub@redhat.com>
+
+       PR inline-asm/85172
+       * g++.dg/ext/builtin13.C: New test.
+       * g++.dg/ext/atomic-4.C: New test.
+
        2018-04-03  Jakub Jelinek  <jakub@redhat.com>
 
        PR rtl-optimization/85167

diff --git a/gcc/testsuite/g++.dg/ext/atomic-4.C b/gcc/testsuite/g++.dg/ext/atomic-4.C
new file mode 100644 (file)
index 0000000..1eba117
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/atomic-4.C
@@ -0,0 +1,9 @@
+// PR inline-asm/85172
+// { dg-do compile }
+// { dg-options "" }
+
+int
+foo (int *p)
+{
+  return !__atomic_always_lock_free (4, ({ __asm (""); p; }));
+}

diff --git a/gcc/testsuite/g++.dg/ext/builtin13.C b/gcc/testsuite/g++.dg/ext/builtin13.C
new file mode 100644 (file)
index 0000000..7007fe8
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/builtin13.C
@@ -0,0 +1,9 @@
+// PR inline-asm/85172
+// { dg-do compile }
+// { dg-options "" }
+
+int
+foo ()
+{
+  return !__builtin_constant_p (({ __asm (""); 0; }));
+}