diff options
| author | Jason Merrill <jason@redhat.com> | 2013-02-15 11:17:25 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2013-02-15 11:17:25 -0500 |
| commit | 30fa2a51fabf5147e339ed2f93ab446a99e3b2b9 (patch) | |
| tree | 9092393d649f7e9f7290ed1ca434bc64ac75ec66 /gcc | |
| parent | 90680f3b80506e19d3fbf53b6a158172c924602f (diff) | |
| download | gcc-30fa2a51fabf5147e339ed2f93ab446a99e3b2b9.zip gcc-30fa2a51fabf5147e339ed2f93ab446a99e3b2b9.tar.gz gcc-30fa2a51fabf5147e339ed2f93ab446a99e3b2b9.tar.bz2 | |
re PR c++/52026 (Constexpr Variable Appears Uninitialized in Lambda)
PR c++/52026
* semantics.c (finish_id_expression): In a template, return
the identifier for a constant variable.
From-SVN: r196081
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 9 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const2.C | 15 |
3 files changed, 29 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9033b51..70dcc20 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2013-02-15 Jason Merrill <jason@redhat.com> + + PR c++/52026 + * semantics.c (finish_id_expression): In a template, return + the identifier for a constant variable. + 2013-02-14 Jason Merrill <jason@redhat.com> PR c++/54922 diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 28b4b79..0e09d04 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -3015,7 +3015,14 @@ finish_id_expression (tree id_expression, FIXME update for final resolution of core issue 696. */ if (decl_constant_var_p (decl)) - return integral_constant_value (decl); + { + if (processing_template_decl) + /* In a template, the constant value may not be in a usable + form, so look it up again at instantiation time. */ + return id_expression; + else + return integral_constant_value (decl); + } /* If we are in a lambda function, we can move out until we hit 1. the context, diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const2.C new file mode 100644 index 0000000..d2457d6 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const2.C @@ -0,0 +1,15 @@ +// PR c++/52026 +// { dg-options "-std=c++11 -O" } +// { dg-do run } + +template<bool B> +int func() { + const int constVal1 = B ? 100 : -100; + const int constVal = constVal1; + return [] { return constVal; }(); +} + +int main() { + if (func<true>() != 100) + __builtin_abort (); +} |