From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 21 Nov 2017 13:54:08 +0000 (+0100)
Subject: re PR tree-optimization/83086 (valgrind error in gimple-ssa-store-merging.c for recen... 
X-Git-Tag: basepoints/gcc-9~3167
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa11164a39053f6f0e24d922a5b6b993c47a96e6;p=thirdparty%2Fgcc.git

re PR tree-optimization/83086 (valgrind error in gimple-ssa-store-merging.c for recent build)

	PR tree-optimization/83086
	* gimple-ssa-store-merging.c
	(imm_store_chain_info::try_coalesce_bswap): Test this_n.base_addr
	rather than n.base_addr.

From-SVN: r255002
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eb2bdd64588d..ab0d1afabc7d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2017-11-21  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/83086
+	* gimple-ssa-store-merging.c
+	(imm_store_chain_info::try_coalesce_bswap): Test this_n.base_addr
+	rather than n.base_addr.
+
 2017-11-21  Martin Liska  <mliska@suse.cz>
 
 	PR rtl-optimization/82044
diff --git a/gcc/gimple-ssa-store-merging.c b/gcc/gimple-ssa-store-merging.c
index c0b1015d9f52..ce0f1f214263 100644
--- a/gcc/gimple-ssa-store-merging.c
+++ b/gcc/gimple-ssa-store-merging.c
@@ -2390,7 +2390,7 @@ imm_store_chain_info::try_coalesce_bswap (merged_store_group *merged_store,
 			    ? try_size - info->bitsize - bitpos
 			    : bitpos))
 	return false;
-      if (n.base_addr && vuse_store)
+      if (this_n.base_addr && vuse_store)
 	{
 	  unsigned int j;
 	  for (j = first; j <= last; ++j)