diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 410cf5470cd..25fb6ff0458 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-09  Andrew Pinski  <andrew_pinski@playstation.sony.com>
+
+	PR c/32796
+	* c-typeck.c (build_binary_op): Check for non pointer types before
+	calling int_fits_type_p.
+
 2007-08-09  Andrew Pinski  <andrew_pinski@playstation.sony.com>
 
 	PR middle-end/32813
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 3e209e2cd70..6964e757388 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -8226,8 +8226,9 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1,
 		       < TYPE_PRECISION (result_type))
 		   && (type
 		       = c_common_signed_or_unsigned_type (unsigned1,
-							   TREE_TYPE (arg1)),
-		       int_fits_type_p (arg0, type)))
+							   TREE_TYPE (arg1)))
+		   && !POINTER_TYPE_P (type)
+		   && int_fits_type_p (arg0, type))
 	    result_type = type;
 	  else if (TREE_CODE (arg1) == INTEGER_CST
 		   && (unsigned0 || !uns)
@@ -8235,8 +8236,9 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1,
 		       < TYPE_PRECISION (result_type))
 		   && (type
 		       = c_common_signed_or_unsigned_type (unsigned0,
-							   TREE_TYPE (arg0)),
-		       int_fits_type_p (arg1, type)))
+							   TREE_TYPE (arg0)))
+		   && !POINTER_TYPE_P (type)
+		   && int_fits_type_p (arg1, type))
 	    result_type = type;
 	}
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 06b2fff2e7d..2659bb23ecb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-09  Andrew Pinski  <andrew_pinski@playstation.sony.com>
+
+	PR c/32796
+	* gcc.c-torture/compile/pr32796.c: New test.
+
 2007-08-09  Andrew Pinski  <andrew_pinski@playstation.sony.com>
 
 	PR middle-end/32813
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr32796.c b/gcc/testsuite/gcc.c-torture/compile/pr32796.c
new file mode 100644
index 00000000000..9e0abfb0eca
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr32796.c
@@ -0,0 +1,6 @@
+
+
+__SIZE_TYPE__ f (void *ptr)
+{
+  return ((__SIZE_TYPE__)(ptr)-1) | 1ULL;
+}