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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114361 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e4186b9..0d0c6a5 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,11 @@
 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
        * typeck.c (build_unary_op): Mark the function as being used.
 

diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index 6242e44..7a46996 100644 (file)
--- 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*.  */