diff options
| author | Jason Merrill <jason@redhat.com> | 2017-06-09 16:13:32 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2017-06-09 16:13:32 -0400 |
| commit | 948d0d9137b8df8320cae815fd8b8aba86bcc160 (patch) | |
| tree | b6f7acf652453119e823b0a90ab801b27f028f01 | |
| parent | a1f427e9a5750602aca0419f947d1612729b5793 (diff) | |
| download | gcc-948d0d9137b8df8320cae815fd8b8aba86bcc160.zip gcc-948d0d9137b8df8320cae815fd8b8aba86bcc160.tar.gz gcc-948d0d9137b8df8320cae815fd8b8aba86bcc160.tar.bz2 | |
* constexpr.c (potential_constant_expression_1): Allow 'this' capture.
From-SVN: r249077
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/constexpr.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1z/lambda-this3.C | 10 |
3 files changed, 15 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f1235a9..a813de7 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2017-06-09 Jason Merrill <jason@redhat.com> + + * constexpr.c (potential_constant_expression_1): Allow 'this' capture. + 2017-06-09 Jan Hubicka <hubicka@ucw.cz> * class.c (build_vtbl_initializer): Mark dvirt_fn as cold. diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 157b20d..8bbe950 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -5296,7 +5296,7 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict, { tree x = TREE_OPERAND (t, 0); STRIP_NOPS (x); - if (is_this_parameter (x)) + if (is_this_parameter (x) && !is_capture_proxy (x)) { if (DECL_CONTEXT (x) && !DECL_DECLARED_CONSTEXPR_P (DECL_CONTEXT (x))) diff --git a/gcc/testsuite/g++.dg/cpp1z/lambda-this3.C b/gcc/testsuite/g++.dg/cpp1z/lambda-this3.C new file mode 100644 index 0000000..b5a1fc6 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/lambda-this3.C @@ -0,0 +1,10 @@ +// { dg-options -std=c++1z } + +struct S { + int i; + constexpr S() : i(5) { + ([*this] () { return i + 10; }()); + } + constexpr operator int() const { return i; } +}; +constexpr int x = S(); |