diff options
| author | Jason Merrill <jason@redhat.com> | 2020-01-31 17:10:30 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2020-01-31 19:06:37 -0500 |
| commit | 00a49cd840f60774b0e9e0109fb10559bc9a9194 (patch) | |
| tree | d8daf51a689a88ba7901d32f63fedfe8fc9ab22f /gcc | |
| parent | e98ebda074bf8fc5f630a93085af81f52437d851 (diff) | |
| download | gcc-00a49cd840f60774b0e9e0109fb10559bc9a9194.zip gcc-00a49cd840f60774b0e9e0109fb10559bc9a9194.tar.gz gcc-00a49cd840f60774b0e9e0109fb10559bc9a9194.tar.bz2 | |
c++: Fix sizeof VLA lambda capture.
sizeof a VLA type is not a constant in C or the GNU C++ extension, so we
need to capture the VLA even in unevaluated context. For PR60855 we stopped
looking through a previous capture, but we also need to capture the first
time the variable is mentioned.
PR c++/86216
* semantics.c (process_outer_var_ref): Capture VLAs even in
unevaluated context.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/lambda/lambda-vla5.C | 13 |
3 files changed, 26 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index cae1c91..999348d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2020-01-31 Jason Merrill <jason@redhat.com> + PR c++/86216 + * semantics.c (process_outer_var_ref): Capture VLAs even in + unevaluated context. + PR c++/14179 * decl.c (reshape_init_array_1): Reuse a single CONSTRUCTOR with non-aggregate elements. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index a489e2c..90f1e18 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -3524,8 +3524,15 @@ tree process_outer_var_ref (tree decl, tsubst_flags_t complain, bool odr_use) { if (cp_unevaluated_operand) - /* It's not a use (3.2) if we're in an unevaluated context. */ - return decl; + { + tree type = TREE_TYPE (decl); + if (!dependent_type_p (type) + && variably_modified_type_p (type, NULL_TREE)) + /* VLAs are used even in unevaluated context. */; + else + /* It's not a use (3.2) if we're in an unevaluated context. */ + return decl; + } if (decl == error_mark_node) return decl; diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-vla5.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-vla5.C new file mode 100644 index 0000000..f3390b2 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-vla5.C @@ -0,0 +1,13 @@ +// PR c++/86216 +// { dg-do compile { target c++11 } } +// { dg-additional-options -Wno-vla } + +template <typename T> void b(int n, T arg) { + int buffer[arg]; + int buffer2[arg][arg]; + [&] { + n = sizeof(buffer); + n = sizeof(buffer2); // { dg-bogus "sorry" "" { xfail *-*-* } } + }(); +} +int main() { b(2, 3); } |