PR c++/89158 - by-value capture of constexpr variable broken.

	* call.c (convert_like_real) <case ck_user>: Call mark_exp_read
	instead of mark_rvalue_use.

	* g++.dg/cpp0x/lambda/lambda-89158.C: New test.

From-SVN: r268561

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 65a850fc53c8d5abeb66b60ad7388877d2f2e382..8ebbc1266ed939664a0e66ea030a8cc95a771c16 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2019-02-05  Marek Polacek  <polacek@redhat.com>
+
+       PR c++/89158 - by-value capture of constexpr variable broken.
+       * call.c (convert_like_real) <case ck_user>: Call mark_exp_read
+       instead of mark_rvalue_use.
+
 2019-02-05  Alexandre Oliva <aoliva@redhat.com>
 
        PR c++/87770

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index c74d1b4ebdf604bae4dd0100c7de5db1c15ec8c9..18b813866c80201070964b536b652293cf699ff0 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -7006,7 +7006,9 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
            return expr;
          }
 
-       expr = mark_rvalue_use (expr);
+       /* We don't know here whether EXPR is being used as an lvalue or
+          rvalue, but we know it's read.  */
+       mark_exp_read (expr);
 
        /* Pass LOOKUP_NO_CONVERSION so rvalue/base handling knows not to allow
           any more UDCs.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 68ce1a46f321007ce7e110608110688dcbe0a1f3..71ea366199582d6cf47aada09582509e61cd7cca 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-05  Marek Polacek  <polacek@redhat.com>
+
+       PR c++/89158 - by-value capture of constexpr variable broken.
+       * g++.dg/cpp0x/lambda/lambda-89158.C: New test.
+
 2019-02-05  Segher Boessenkool  <segher@kernel.crashing.org>
 
        * gcc.dg/vect/pr84711.c: Use -Wno-psabi.

diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-89158.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-89158.C
new file mode 100644 (file)
index 0000000..15f15b4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-89158.C
@@ -0,0 +1,11 @@
+// PR c++/89158
+// { dg-do compile { target c++11 } }
+
+struct T { T(const int&); };
+void Func(T);
+
+void test()
+{
+  constexpr int Val = 42;
+  [Val]() { Func(Val); };
+}