56d343
2016-11-18  Jakub Jelinek  <jakub@redhat.com>
56d343
56d343
	PR middle-end/78416
56d343
	* expmed.c (expand_divmod): For modes wider than HWI, take into
56d343
	account implicit 1 bits above msb for EXACT_POWER_OF_2_OR_ZERO_P.
56d343
56d343
	* gcc.dg/torture/pr78416.c: New test.
56d343
56d343
--- gcc/expmed.c
56d343
+++ gcc/expmed.c
56d343
@@ -3844,7 +3844,15 @@ expand_divmod (int rem_flag, enum tree_code code, enum machine_mode mode,
56d343
       if (unsignedp)
56d343
 	ext_op1 &= GET_MODE_MASK (mode);
56d343
       op1_is_pow2 = ((EXACT_POWER_OF_2_OR_ZERO_P (ext_op1)
56d343
-		     || (! unsignedp && EXACT_POWER_OF_2_OR_ZERO_P (-ext_op1))));
56d343
+		      /* If mode is wider than HWI and op1 has msb set,
56d343
+			 then it has there extra implicit 1 bits above it.  */
56d343
+		      && (GET_MODE_PRECISION (mode) <= HOST_BITS_PER_WIDE_INT
56d343
+			  || INTVAL (op1) >= 0))
56d343
+		     || (! unsignedp
56d343
+			 && EXACT_POWER_OF_2_OR_ZERO_P (-ext_op1)
56d343
+			 && (GET_MODE_PRECISION (mode)
56d343
+			     <= HOST_BITS_PER_WIDE_INT
56d343
+			     || INTVAL (op1) < 0)));
56d343
     }
56d343
 
56d343
   /*
56d343
@@ -3987,8 +3995,17 @@ expand_divmod (int rem_flag, enum tree_code code, enum machine_mode mode,
56d343
       op1_is_constant = CONST_INT_P (op1);
56d343
       op1_is_pow2 = (op1_is_constant
56d343
 		     && ((EXACT_POWER_OF_2_OR_ZERO_P (INTVAL (op1))
56d343
-			  || (! unsignedp
56d343
-			      && EXACT_POWER_OF_2_OR_ZERO_P (-UINTVAL (op1))))));
56d343
+			  /* If mode is wider than HWI and op1 has msb set,
56d343
+			     then it has there extra implicit 1 bits above
56d343
+			     it.  */
56d343
+			  && (GET_MODE_PRECISION (compute_mode)
56d343
+			      <= HOST_BITS_PER_WIDE_INT
56d343
+			      || INTVAL (op1) >= 0))
56d343
+			 || (! unsignedp
56d343
+			     && EXACT_POWER_OF_2_OR_ZERO_P (-UINTVAL (op1))
56d343
+			     && (GET_MODE_PRECISION (compute_mode)
56d343
+				 <= HOST_BITS_PER_WIDE_INT
56d343
+				 || INTVAL (op1) < 0))));
56d343
     }
56d343
 
56d343
   /* If one of the operands is a volatile MEM, copy it into a register.  */
56d343
@@ -4031,7 +4048,8 @@ expand_divmod (int rem_flag, enum tree_code code, enum machine_mode mode,
56d343
 		unsigned HOST_WIDE_INT d = (INTVAL (op1)
56d343
 					    & GET_MODE_MASK (compute_mode));
56d343
 
56d343
-		if (EXACT_POWER_OF_2_OR_ZERO_P (d))
56d343
+		if (EXACT_POWER_OF_2_OR_ZERO_P (d)
56d343
+		    && (INTVAL (op1) >= 0 || size <= HOST_BITS_PER_WIDE_INT))
56d343
 		  {
56d343
 		    pre_shift = floor_log2 (d);
56d343
 		    if (rem_flag)
56d343
@@ -4179,6 +4197,7 @@ expand_divmod (int rem_flag, enum tree_code code, enum machine_mode mode,
56d343
 		      goto fail1;
56d343
 		  }
56d343
 		else if (EXACT_POWER_OF_2_OR_ZERO_P (d)
56d343
+			 && (size <= HOST_BITS_PER_WIDE_INT || d >= 0)
56d343
 			 && (rem_flag
56d343
 			     ? smod_pow2_cheap (speed, compute_mode)
56d343
 			     : sdiv_pow2_cheap (speed, compute_mode))
56d343
@@ -4192,7 +4211,9 @@ expand_divmod (int rem_flag, enum tree_code code, enum machine_mode mode,
56d343
 						compute_mode)
56d343
 				 != CODE_FOR_nothing)))
56d343
 		  ;
56d343
-		else if (EXACT_POWER_OF_2_OR_ZERO_P (abs_d))
56d343
+		else if (EXACT_POWER_OF_2_OR_ZERO_P (abs_d)
56d343
+			 && (size <= HOST_BITS_PER_WIDE_INT
56d343
+			     || abs_d != (unsigned HOST_WIDE_INT) d))
56d343
 		  {
56d343
 		    if (rem_flag)
56d343
 		      {
56d343
@@ -4504,7 +4525,10 @@ expand_divmod (int rem_flag, enum tree_code code, enum machine_mode mode,
56d343
       case CEIL_MOD_EXPR:
56d343
 	if (unsignedp)
56d343
 	  {
56d343
-	    if (op1_is_constant && EXACT_POWER_OF_2_OR_ZERO_P (INTVAL (op1)))
56d343
+	    if (op1_is_constant
56d343
+		&& EXACT_POWER_OF_2_OR_ZERO_P (INTVAL (op1))
56d343
+		&& (size <= HOST_BITS_PER_WIDE_INT
56d343
+		    || INTVAL (op1) >= 0))
56d343
 	      {
56d343
 		rtx t1, t2, t3;
56d343
 		unsigned HOST_WIDE_INT d = INTVAL (op1);
56d343
--- gcc/testsuite/gcc.dg/torture/pr78416.c
56d343
+++ gcc/testsuite/gcc.dg/torture/pr78416.c
56d343
@@ -0,0 +1,17 @@
56d343
+/* PR middle-end/78416 */
56d343
+/* { dg-do run { target int128 } } */
56d343
+
56d343
+int
56d343
+main ()
56d343
+{
56d343
+  unsigned __int128 x;
56d343
+  x = 0xFFFFFFFFFFFFFFFFULL;
56d343
+  x /= ~0x7FFFFFFFFFFFFFFFLL;
56d343
+  if (x != 0)
56d343
+    __builtin_abort ();
56d343
+  x = ~0x7FFFFFFFFFFFFFFELL;
56d343
+  x /= ~0x7FFFFFFFFFFFFFFFLL;
56d343
+  if (x != 1)
56d343
+    __builtin_abort ();
56d343
+  return 0;
56d343
+}