diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5958166e6c59c1485bf2b246bb9549441e8f3b6b..95914c7ca68dc8b6d5a198247fff6ed49c2c46b9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-20  Jakub Jelinek  <jakub@redhat.com>
+
+	PR debug/45006
+	* cfgexpand.c (expand_debug_expr): Only look at TYPE_UNSIGNED of
+	operand's type if exp is tcc_unary class tree.
+
 2010-07-20  Nathan Froyd  <froydnj@codesourcery.com>
 
 	* config/rs6000/rs6000.md (abs<mode>2_isel, nabs<mode>2_isel):
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 3d7bdd0f81d6f4d4bd408e07066218e172c0b40b..fef31905bd5c3bd92e67b9d1c15d77b33970c50d 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -2427,7 +2427,9 @@ expand_debug_expr (tree exp)
 	  op0 = simplify_gen_subreg (mode, op0, inner_mode,
 				     subreg_lowpart_offset (mode,
 							    inner_mode));
-	else if (TYPE_UNSIGNED (TREE_TYPE (TREE_OPERAND (exp, 0))))
+	else if (TREE_CODE_CLASS (TREE_CODE (exp)) == tcc_unary
+		 ? TYPE_UNSIGNED (TREE_TYPE (TREE_OPERAND (exp, 0)))
+		 : unsignedp)
 	  op0 = gen_rtx_ZERO_EXTEND (mode, op0);
 	else
 	  op0 = gen_rtx_SIGN_EXTEND (mode, op0);