aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2011-06-01 14:07:03 -0400
committerJason Merrill <jason@gcc.gnu.org>2011-06-01 14:07:03 -0400
commit7448d2e73ea9513f001327757541328bb8137b38 (patch)
treea24ac96e337f515bbcba78ccbdc462988020bc46 /gcc
parent5f57dccbc6b70929e8762d6a4ee75a483d466f58 (diff)
downloadgcc-7448d2e73ea9513f001327757541328bb8137b38.zip
gcc-7448d2e73ea9513f001327757541328bb8137b38.tar.gz
gcc-7448d2e73ea9513f001327757541328bb8137b38.tar.bz2
re PR c++/49253 (Debug-mode forward_list broken)
PR c++/49253 * typeck2.c (build_x_arrow): Don't use build_min_nt. From-SVN: r174539
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/typeck2.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7a8042b..921f98f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-01 Jason Merrill <jason@redhat.com>
+
+ PR c++/49253
+ * typeck2.c (build_x_arrow): Don't use build_min_nt.
+
2010-05-31 Fabien ChĂȘne <fabien@gcc.gnu.org>
PR c++/48010
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 031f076..4d5c21a 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -1463,9 +1463,9 @@ build_x_arrow (tree expr)
{
if (processing_template_decl)
{
- expr = build_min_non_dep (ARROW_EXPR, last_rval, orig_expr);
- /* It will be dereferenced. */
- TREE_TYPE (expr) = TREE_TYPE (TREE_TYPE (last_rval));
+ expr = build_min (ARROW_EXPR, TREE_TYPE (TREE_TYPE (last_rval)),
+ orig_expr);
+ TREE_SIDE_EFFECTS (expr) = TREE_SIDE_EFFECTS (last_rval);
return expr;
}