diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7999a502aa6..b915e682a45 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-30  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/53519
+	* combine.c (simplify_shift_const_1) <case NOT>: Use constm1_rtx
+	instead of GEN_INT (GET_MODE_MASK (mode)) as second operand of XOR.
+
 2012-05-30  Ramana Radhakrishnan  <ramana.radhakrishnan@linaro.org>
 
 	* config/arm/arm.c (arm_evpc_neon_vrev): Adjust off by one error.
diff --git a/gcc/combine.c b/gcc/combine.c
index d23ecfcbccd..d6897a17958 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -10284,8 +10284,7 @@ simplify_shift_const_1 (enum rtx_code code, enum machine_mode result_mode,
 	    break;
 
 	  /* Make this fit the case below.  */
-	  varop = gen_rtx_XOR (mode, XEXP (varop, 0),
-			       GEN_INT (GET_MODE_MASK (mode)));
+	  varop = gen_rtx_XOR (mode, XEXP (varop, 0), constm1_rtx);
 	  continue;
 
 	case IOR:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7e52cb9499a..2f42a8e671e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-30  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/53519
+	* gcc.c-torture/compile/pr53519.c: New test.
+
 2012-05-30  Ramana Radhakrishnan  <ramana.radhakrishnan@linaro.org>
 
 	* gcc.target/arm/neon-vrev.c: New.
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr53519.c b/gcc/testsuite/gcc.c-torture/compile/pr53519.c
new file mode 100644
index 00000000000..3adadcb2c0e
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr53519.c
@@ -0,0 +1,26 @@
+/* PR rtl-optimization/53519 */
+
+int a, b, c, d, e;
+
+short int
+foo (short int x)
+{
+  return a == 0 ? x : 0;
+}
+
+short int
+bar (int x, int y)
+{
+  return x + y;
+}
+
+void
+baz (void)
+{
+  if (!e)
+    {
+      int f = foo (65535 ^ b);
+      if (bar (!6L <= ~f, ~e) == c)
+	d = 0;
+    }
+}