diff options
| author | Jason Merrill <jason@redhat.com> | 2015-12-20 22:04:08 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2015-12-20 22:04:08 -0500 |
| commit | 58688a4ec04a2e3d73e2a381f0003f888ad305d1 (patch) | |
| tree | 0155bb24d25ec8b4aead8bf9724a4788f9faa6e5 | |
| parent | 3057cbb3d89f1ddb7cc4566df7b90af9c645b0c3 (diff) | |
| download | gcc-58688a4ec04a2e3d73e2a381f0003f888ad305d1.zip gcc-58688a4ec04a2e3d73e2a381f0003f888ad305d1.tar.gz gcc-58688a4ec04a2e3d73e2a381f0003f888ad305d1.tar.bz2 | |
re PR c++/67411 (internal compiler error: in tsubst_copy, at cp/pt.c:13473)
PR c++/67411
* decl2.c (decl_maybe_constant_var_p): Use DECL_HAS_VALUE_EXPR_P.
From-SVN: r231869
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e7adad3..1dd533e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,6 +1,9 @@ 2015-12-20 Jason Merrill <jason@redhat.com> PR c++/67411 + * decl2.c (decl_maybe_constant_var_p): Use DECL_HAS_VALUE_EXPR_P. + + PR c++/67411 * lambda.c (generic_lambda_fn_p): Split out from... (maybe_add_lambda_conv_op): ...here. * semantics.c (process_outer_var_ref): Don't defer maybe-constant diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 1e4282a..e9c9ffc 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -4222,7 +4222,7 @@ decl_maybe_constant_var_p (tree decl) return false; if (DECL_DECLARED_CONSTEXPR_P (decl)) return true; - if (DECL_VALUE_EXPR (decl)) + if (DECL_HAS_VALUE_EXPR_P (decl)) /* A proxy isn't constant. */ return false; return (CP_TYPE_CONST_NON_VOLATILE_P (type) |