diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ddd78717deb..606bbe0dd23 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-25  Jeff Law  <law@redhat.com>
+        * tree-ssa-dom.c (record_equivalences_from_incoming_edge): Add missing
+        check for INTEGRAL_TYPE_P that was missing due to checking in
+	wrong version of prior patch.
+
 2013-03-25  Walter Lee  <walt@tilera.com>
 
 	* config/tilegx/tilegx-builtins.h (enum tilegx_builtin): Add
diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index a71c6dcdfbb..29d2bb4f3e1 100644
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -1153,7 +1153,8 @@ record_equivalences_from_incoming_edge (basic_block bb)
 
 		  /* If the constant is in the range of the type of OLD_RHS,
 		     then convert the constant and record the equivalence.  */
-		  if (int_fits_type_p (rhs, TREE_TYPE (old_rhs)))
+		  if (INTEGRAL_TYPE_P (TREE_TYPE (old_rhs))
+		      && int_fits_type_p (rhs, TREE_TYPE (old_rhs)))
 		    {
 		      tree newval = fold_convert (TREE_TYPE (old_rhs), rhs);
 		      record_equality (old_rhs, newval);