From: Alan Lawrence <alan.lawrence@arm.com>
Date: Fri, 21 Nov 2014 14:44:31 +0000 (+0000)
Subject: Revert: Workaround following [PATCH] Pul all constants last in tree_swap_operands_p
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8f399c3e858884a5d0b7f2bc1df162b01acd84e3;p=gcc.git

Revert: Workaround following [PATCH] Pul all constants last in tree_swap_operands_p

	https://gcc.gnu.org/ml/gcc-patches/2014-09/msg01509.html
	2014-09-22  Alan Lawrence  <alan.lawrence@arm.com>
	gcc/:
        	* fold-const.c (tree_swap_operands_p): Strip only sign-preserving NOPs.

From-SVN: r217927
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4b14d1d62a0..9902e537dbb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-21  Alan Lawrence  <alan.lawrence@arm.com>
+
+	Revert:
+	2014-09-22  Alan Lawrence  <alan.lawrence@arm.com>
+	* fold-const.c (tree_swap_operands_p): Strip only sign-preserving NOPs.
+
 2014-11-21  Andrew Bennett  <andrew.bennett@imgtec.com>
 
 	* config/mips/mips.c (mips_process_sync_loop): Place a 
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 9183430205b..740bf0bc17c 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -6606,8 +6606,8 @@ tree_swap_operands_p (const_tree arg0, const_tree arg1, bool reorder)
   if (CONSTANT_CLASS_P (arg0))
     return 1;
 
-  STRIP_SIGN_NOPS (arg0);
-  STRIP_SIGN_NOPS (arg1);
+  STRIP_NOPS (arg0);
+  STRIP_NOPS (arg1);
 
   if (TREE_CONSTANT (arg1))
     return 0;