diff options
| author | Patrick Palka <ppalka@gcc.gnu.org> | 2016-04-08 20:17:10 +0000 |
|---|---|---|
| committer | Patrick Palka <ppalka@gcc.gnu.org> | 2016-04-08 20:17:10 +0000 |
| commit | 56cfb59670621ffe7761eb200814dcc27d99cf63 (patch) | |
| tree | e8e14a196ca10d04739f53b754414a46277ad80e /gcc/cp | |
| parent | abc0647a4d9f9a7acf0fdf39e9abc2fe39c5948d (diff) | |
| download | gcc-56cfb59670621ffe7761eb200814dcc27d99cf63.zip gcc-56cfb59670621ffe7761eb200814dcc27d99cf63.tar.gz gcc-56cfb59670621ffe7761eb200814dcc27d99cf63.tar.bz2 | |
Fix PR c++/70590 (error: location references block not in block tree)
gcc/cp/ChangeLog:
PR c++/70590
PR c++/70452
* constexpr.c (cxx_eval_outermost_expression): Call unshare_expr
on the result if it's not a CONSTRUCTOR.
gcc/testsuite/ChangeLog:
PR c++/70590
PR c++/70452
* g++.dg/pr70590.C: New test.
* g++.dg/pr70590-2.C: New test.
From-SVN: r234837
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/constexpr.c | 9 |
2 files changed, 16 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a8cb00e..1a690a9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2016-04-08 Patrick Palka <ppalka@gcc.gnu.org> + + PR c++/70590 + PR c++/70452 + * constexpr.c (cxx_eval_outermost_expression): Call unshare_expr + on the result if it's not a CONSTRUCTOR. + 2016-04-07 Patrick Palka <ppalka@gcc.gnu.org> PR c++/70452 diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 5bccdec..e6e2cf6 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -4164,6 +4164,12 @@ cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant, if (!non_constant_p && overflow_p) non_constant_p = true; + /* Unshare the result unless it's a CONSTRUCTOR in which case it's already + unshared. */ + bool should_unshare = true; + if (r == t || TREE_CODE (r) == CONSTRUCTOR) + should_unshare = false; + if (non_constant_p && !allow_non_constant) return error_mark_node; else if (non_constant_p && TREE_CONSTANT (r)) @@ -4180,6 +4186,9 @@ cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant, else if (non_constant_p || r == t) return t; + if (should_unshare) + r = unshare_expr (r); + if (TREE_CODE (r) == CONSTRUCTOR && CLASS_TYPE_P (TREE_TYPE (r))) { if (TREE_CODE (t) == TARGET_EXPR |