diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2015-02-17 08:25:30 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2015-02-17 09:25:30 +0100 |
| commit | 4414e22eeeaaf9dbd41f182173aa0a23ee792d1a (patch) | |
| tree | 718df3e09468a9f5e94e5d9d21c0909ac8cc6537 /gcc | |
| parent | 524d87f3a58e0db53653a554b9ed96816f9cd71a (diff) | |
| download | gcc-4414e22eeeaaf9dbd41f182173aa0a23ee792d1a.zip gcc-4414e22eeeaaf9dbd41f182173aa0a23ee792d1a.tar.gz gcc-4414e22eeeaaf9dbd41f182173aa0a23ee792d1a.tar.bz2 | |
re PR c++/65075 (constexpr regression)
PR c++/65075
* constexpr.c (check_constexpr_bind_expr_vars): Allow
implicit typedefs for lambda types.
* g++.dg/cpp0x/pr65075.C: New test.
Co-Authored-By: Jakub Jelinek <jakub@redhat.com>
From-SVN: r220748
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/constexpr.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/pr65075.C | 17 |
4 files changed, 32 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6d21c28..115a9f3 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2015-02-17 Paolo Carlini <paolo.carlini@oracle.com> + Jakub Jelinek <jakub@redhat.com> + + PR c++/65075 + * constexpr.c (check_constexpr_bind_expr_vars): Allow + implicit typedefs for lambda types. + 2015-02-13 Paolo Carlini <paolo.carlini@oracle.com> PR c++/60894 diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index d415dd4..32a23ff7 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -416,7 +416,8 @@ check_constexpr_bind_expr_vars (tree t) for (tree var = BIND_EXPR_VARS (t); var; var = DECL_CHAIN (var)) if (TREE_CODE (var) == TYPE_DECL - && DECL_IMPLICIT_TYPEDEF_P (var)) + && DECL_IMPLICIT_TYPEDEF_P (var) + && !LAMBDA_TYPE_P (TREE_TYPE (var))) return false; return true; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ee133fa..ba21ab4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2015-02-17 Paolo Carlini <paolo.carlini@oracle.com> + Jakub Jelinek <jakub@redhat.com> + + PR c++/65075 + * g++.dg/cpp0x/pr65075.C: New test. + 2015-02-16 David Edelsohn <dje.gcc@gmail.com> PR target/65058 diff --git a/gcc/testsuite/g++.dg/cpp0x/pr65075.C b/gcc/testsuite/g++.dg/cpp0x/pr65075.C new file mode 100644 index 0000000..7d953ff --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr65075.C @@ -0,0 +1,17 @@ +// PR c++/65075 +// { dg-do compile { target c++11 } } + +typedef void (*E) (); +template <class T> +constexpr E +bar (bool a) +{ + return a ? []() {} : []() {}; +} + +void +foo () +{ + (bar<int> (false)) (); + (bar<int> (true)) (); +} |