From: ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 29 Oct 2013 12:10:37 +0000 (+0000)
Subject: 	* expr.c (expand_expr_real_1) <case MEM>: Eliminate small redundancy.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=628e6f66aefb383df5860a04bc7aa76c4db06e21;p=thirdparty%2Fgcc.git

	* expr.c (expand_expr_real_1) <case MEM>: Eliminate small redundancy.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@204155 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fca665b39be7..746f12509e6b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* expr.c (expand_expr_real_1) <case MEM>: Eliminate small redundancy.
+
 2013-10-29  David Malcolm  <dmalcolm@redhat.com>
 
 	* doc/gty.texi ("Inheritance and GTY"): Make it clear that
diff --git a/gcc/expr.c b/gcc/expr.c
index fbd301b67d1d..4bb4d666968f 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -9648,8 +9648,8 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
 	    rtx off
 	      = immed_double_int_const (mem_ref_offset (exp), address_mode);
 	    op0 = simplify_gen_binary (PLUS, address_mode, op0, off);
+	    op0 = memory_address_addr_space (mode, op0, as);
 	  }
-	op0 = memory_address_addr_space (mode, op0, as);
 	temp = gen_rtx_MEM (mode, op0);
 	set_mem_attributes (temp, exp, 0);
 	set_mem_addr_space (temp, as);