PR c++/67411

	* decl2.c (decl_maybe_constant_var_p): A proxy isn't constant.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231862 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9b8c2ffc6f49579e3219c69d1251236d4c6bfcac..40ae390507d9adb788bf88de16c953cba5749a94 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-20  Jason Merrill  <jason@redhat.com>
+
+       PR c++/67411
+       * decl2.c (decl_maybe_constant_var_p): A proxy isn't constant.
+
 2015-12-18  Patrick Palka  <ppalka@gcc.gnu.org>
 
        PR c++/68978

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 5ae6266c7e1703975aaee7d4eafcf5a4fa76eda5..1e4282a806701937f2d5c1b3ec91c1186918e1c1 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -4222,6 +4222,9 @@ decl_maybe_constant_var_p (tree decl)
     return false;
   if (DECL_DECLARED_CONSTEXPR_P (decl))
     return true;
+  if (DECL_VALUE_EXPR (decl))
+    /* A proxy isn't constant.  */
+    return false;
   return (CP_TYPE_CONST_NON_VOLATILE_P (type)
          && INTEGRAL_OR_ENUMERATION_TYPE_P (type));
 }

diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-generic-const1.C b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-const1.C
new file mode 100644 (file)
index 0000000..8b54578
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-const1.C
@@ -0,0 +1,18 @@
+// PR c++/67411
+// { dg-do compile { target c++14 } }
+
+template <class T>
+void f()
+{
+  int i = 42;
+  [x = i] {
+    [&](auto) {
+      [=] { return x; }();
+    }(1);
+  }();
+}
+
+int main()
+{
+  f<int>();
+}