diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e4186b9d86405d06701ba44824249270c5bef198..0d0c6a59b89ee3464b98f50290d77808357c84b5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-01  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR c++/27592
+	* rtti.c (build_dynamic_cast_1): Call c_common_truthvalue_conversion
+	on operand of the COND_EXPR for the null pointer check.
+
 2006-06-01  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	PR c++/26740
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index 6242e44c3e944cfc37f55b02c081a55e6a9c807c..7a46996713218f318e4cfb8cb22040cb3c906623 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -677,9 +677,11 @@ build_dynamic_cast_1 (tree type, tree expr)
 	  if (tc == REFERENCE_TYPE)
 	    {
 	      tree bad = throw_bad_cast ();
+	      tree neq;
 
 	      result = save_expr (result);
-	      return build3 (COND_EXPR, type, result, result, bad);
+	      neq = c_common_truthvalue_conversion (result);
+	      return build3 (COND_EXPR, type, neq, result, bad);
 	    }
 
 	  /* Now back to the type we want from a void*.  */