re PR rtl-optimization/87361 (gcc.target/sparc/20161111-1.c FAILs)

	PR rtl-optimization/87361
	* rtlanal.c (nonzero_bits1): Revert accidental change.

From-SVN: r264420

gcc/ChangeLog

+2018-09-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	PR rtl-optimization/87361
+	* rtlanal.c (nonzero_bits1): Revert accidental change.
+
 2018-09-19  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/87349

gcc/rtlanal.c

@@ -4765,10 +4765,10 @@ nonzero_bits1 (const_rtx x, scalar_int_mode mode, const_rtx known_x,
 	  if ((!WORD_REGISTER_OPERATIONS
 	       /* If this is a typical RISC machine, we only have to worry
 		  about the way loads are extended.  */
-	       || !MEM_P (SUBREG_REG (x))
 	       || ((extend_op = load_extend_op (inner_mode)) == SIGN_EXTEND
 		   ? val_signbit_known_set_p (inner_mode, nonzero)
-		   : extend_op != ZERO_EXTEND))
+		   : extend_op != ZERO_EXTEND)
+	       || (!MEM_P (SUBREG_REG (x)) && !REG_P (SUBREG_REG (x))))
 	      && xmode_width > inner_width)
 	    nonzero
 	      |= (GET_MODE_MASK (GET_MODE (x)) & ~GET_MODE_MASK (inner_mode));