From: Jason Merrill <jason@redhat.com>
Date: Wed, 1 Jun 2011 18:07:03 +0000 (-0400)
Subject: re PR c++/49253 (Debug-mode forward_list broken)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7448d2e73ea9513f001327757541328bb8137b38;p=gcc.git

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
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7a8042b6194..921f98f11ac 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 031f076863f..4d5c21ad5f3 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;
 	}