From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 27 May 2015 04:59:42 +0000 (+0000)
Subject:        * combine.c (find_split_point): Verify that the shift count is a
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bebaef098bfba2f0fe7ae64ed3dc42ff0db3b9d5;p=thirdparty%2Fgcc.git

   * combine.c (find_split_point): Verify that the shift count is a
       constant when choosing (plus (ashift ...)) as a split point.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f02ba5cc1c34..bf90c8642069 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2015-05-26  Jeff Law  <law@redhat.com>
 
+	* combine.c (find_split_point): Verify that the shift count is a
+	constant when choosing (plus (ashift ...)) as a split point.
+
 	* tree-ssa-threadupdate.c: Replace 8 space sequences with tabs.
 	No functional changes.
 
diff --git a/gcc/combine.c b/gcc/combine.c
index 73d141edc078..55a2e35ba48b 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -5157,7 +5157,8 @@ find_split_point (rtx *loc, rtx_insn *insn, bool set_src)
          worthless to try this split.  */
       if (!set_src
 	  && (GET_CODE (XEXP (x, 0)) == MULT
-	      || GET_CODE (XEXP (x, 0)) == ASHIFT))
+	      || (GET_CODE (XEXP (x, 0)) == ASHIFT
+		  && GET_CODE (XEXP (XEXP (x, 0), 1)) == CONST_INT)))
         return loc;
 
     default: