diff mbox

[6/7] Temporary workaround to get aarch64 bootstrap

Message ID 55ECFE5C.6010001@linaro.org
State New
Headers show

Commit Message

Kugan Vivekanandarajah Sept. 7, 2015, 3:02 a.m. UTC 
AARCH64 bootstrap problem that started happening with the commit
94f92c36a83d66a893c3bc6f00a038ba3dbe2a6f. simplify-rtx.c mis-compiled in
stage due to this fwprop.c is failing. It looks to me that there is a
latent issue which gets exposed my patch. I can also reproduce this in
x86_64 if I use the same PROMOTE_MODE which is used in aarch64 port. For
the time being, I am using  patch
0006-temporary-workaround-for-bootstrap-failure-due-to-co.patch as a
workaround .
diff mbox

Patch

From 6a10c856374446ab6d18eb9ce840c08cac440a61 Mon Sep 17 00:00:00 2001
From: Kugan Vivekanandarajah <kugan.vivekanandarajah@linaro.org>
Date: Tue, 1 Sep 2015 08:44:59 +1000
Subject: [PATCH 6/8] temporary workaround for bootstrap failure due to copy
 coalescing

---
 gcc/tree-ssa-coalesce.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gcc/tree-ssa-coalesce.c b/gcc/tree-ssa-coalesce.c
index 6468012..b18f0b8 100644
--- a/gcc/tree-ssa-coalesce.c
+++ b/gcc/tree-ssa-coalesce.c
@@ -1384,11 +1384,13 @@  gimple_can_coalesce_p (tree name1, tree name2)
 	 SSA_NAMEs.  Now, if a parm or result has BLKmode, do not
 	 coalesce its SSA versions with those of any other variables,
 	 because it may be passed by reference.  */
-      return ((!var1 || VAR_P (var1)) && (!var2 || VAR_P (var2)))
+      return ((!var1 || VAR_P (var1)) && (!var2 || VAR_P (var2)));
+#if 0
 	|| (/* The case var1 == var2 is already covered above.  */
 	    !parm_in_stack_slot_p (var1)
 	    && !parm_in_stack_slot_p (var2)
 	    && promote_ssa_mode (name1, NULL) == promote_ssa_mode (name2, NULL));
+#endif
     }
 
   /* If the types are not the same, check for a canonical type match.  This
-- 
1.9.1