PR c++/43509

[pf3gnuchains/gcc-fork.git] / gcc / c-convert.c

diff --git a/gcc/c-convert.c b/gcc/c-convert.c
index 718fd5a..09638d5 100644 (file)
--- a/gcc/c-convert.c
+++ b/gcc/c-convert.c
@@ -1,12 +1,12 @@
 /* Language-level data type conversion for GNU C.
 /* Language-level data type conversion for GNU C.

-   Copyright (C) 1987, 1988, 1991, 1998, 2002, 2003, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1987, 1988, 1991, 1998, 2002, 2003, 2004, 2005, 2007, 2008,
+   2009 Free Software Foundation, Inc.

 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

-Software Foundation; either version 2, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later

 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -15,9 +15,8 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 
 /* This file contains the functions for converting C expressions
 
 
 /* This file contains the functions for converting C expressions


@@ -36,6 +35,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #include "c-tree.h"
 #include "langhooks.h"
 #include "toplev.h"
 #include "c-tree.h"
 #include "langhooks.h"
 #include "toplev.h"

+#include "target.h"

 
 /* Change of width--truncation and extension of integers or reals--
    is represented with NOP_EXPR.  Proper functioning of many things
 
 /* Change of width--truncation and extension of integers or reals--
    is represented with NOP_EXPR.  Proper functioning of many things


@@ -69,14 +69,32 @@ convert (tree type, tree expr)
 {
   tree e = expr;
   enum tree_code code = TREE_CODE (type);
 {
   tree e = expr;
   enum tree_code code = TREE_CODE (type);

+  const char *invalid_conv_diag;
+  tree ret;
+  location_t loc = EXPR_LOCATION (expr);

 
 

-  if (type == TREE_TYPE (expr)
-      || TREE_CODE (expr) == ERROR_MARK
-      || code == ERROR_MARK || TREE_CODE (TREE_TYPE (expr)) == ERROR_MARK)
+  if (type == error_mark_node
+      || expr == error_mark_node
+      || TREE_TYPE (expr) == error_mark_node)
+    return error_mark_node;
+
+  if ((invalid_conv_diag
+       = targetm.invalid_conversion (TREE_TYPE (expr), type)))
+    {
+      error (invalid_conv_diag);
+      return error_mark_node;
+    }
+
+  if (type == TREE_TYPE (expr))

     return expr;
     return expr;

+  ret = targetm.convert_to_type (type, expr);
+  if (ret)
+      return ret;
+
+  STRIP_TYPE_NOPS (e);

 
   if (TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (TREE_TYPE (expr)))
 
   if (TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (TREE_TYPE (expr)))

-    return fold (build1 (NOP_EXPR, type, expr));
+    return fold_convert_loc (loc, type, expr);

   if (TREE_CODE (TREE_TYPE (expr)) == ERROR_MARK)
     return error_mark_node;
   if (TREE_CODE (TREE_TYPE (expr)) == VOID_TYPE)
   if (TREE_CODE (TREE_TYPE (expr)) == ERROR_MARK)
     return error_mark_node;
   if (TREE_CODE (TREE_TYPE (expr)) == VOID_TYPE)


@@ -84,40 +102,56 @@ convert (tree type, tree expr)
       error ("void value not ignored as it ought to be");
       return error_mark_node;
     }
       error ("void value not ignored as it ought to be");
       return error_mark_node;
     }

-  if (code == VOID_TYPE)
-    return build1 (CONVERT_EXPR, type, e);
-#if 0
-  /* This is incorrect.  A truncation can't be stripped this way.
-     Extensions will be stripped by the use of get_unwidened.  */
-  if (TREE_CODE (expr) == NOP_EXPR)
-    return convert (type, TREE_OPERAND (expr, 0));
-#endif
-  if (code == INTEGER_TYPE || code == ENUMERAL_TYPE)
-    return fold (convert_to_integer (type, e));
-  if (code == BOOLEAN_TYPE)
+
+  switch (code)

     {
     {

-      tree t = c_objc_common_truthvalue_conversion (expr);
-      if (TREE_CODE (t) == ERROR_MARK)
-       return t;
-
-      /* If it returns a NOP_EXPR, we must fold it here to avoid
-        infinite recursion between fold () and convert ().  */
-      if (TREE_CODE (t) == NOP_EXPR)
-       return fold (build1 (NOP_EXPR, type, TREE_OPERAND (t, 0)));
-      else
-       return fold (build1 (NOP_EXPR, type, t));
+    case VOID_TYPE:
+      return fold_convert_loc (loc, type, e);
+
+    case INTEGER_TYPE:
+    case ENUMERAL_TYPE:
+      ret = convert_to_integer (type, e);
+      goto maybe_fold;
+
+    case BOOLEAN_TYPE:
+      return fold_convert_loc
+       (loc, type, c_objc_common_truthvalue_conversion (input_location, expr));
+
+    case POINTER_TYPE:
+    case REFERENCE_TYPE:
+      ret = convert_to_pointer (type, e);
+      goto maybe_fold;
+
+    case REAL_TYPE:
+      ret = convert_to_real (type, e);
+      goto maybe_fold;
+
+    case FIXED_POINT_TYPE:
+      ret = convert_to_fixed (type, e);
+      goto maybe_fold;
+
+    case COMPLEX_TYPE:
+      ret = convert_to_complex (type, e);
+      goto maybe_fold;
+
+    case VECTOR_TYPE:
+      ret = convert_to_vector (type, e);
+      goto maybe_fold;
+
+    case RECORD_TYPE:
+    case UNION_TYPE:
+      if (lang_hooks.types_compatible_p (type, TREE_TYPE (expr)))
+       return e;
+      break;
+
+    default:
+      break;
+
+    maybe_fold:
+      if (TREE_CODE (ret) != C_MAYBE_CONST_EXPR)
+       ret = fold (ret);
+      return ret;

     }
     }

-  if (code == POINTER_TYPE || code == REFERENCE_TYPE)
-    return fold (convert_to_pointer (type, e));
-  if (code == REAL_TYPE)
-    return fold (convert_to_real (type, e));
-  if (code == COMPLEX_TYPE)
-    return fold (convert_to_complex (type, e));
-  if (code == VECTOR_TYPE)
-    return fold (convert_to_vector (type, e));
-  if ((code == RECORD_TYPE || code == UNION_TYPE)
-      && lang_hooks.types_compatible_p (type, TREE_TYPE (expr)))
-      return e;

 
   error ("conversion to non-scalar type requested");
   return error_mark_node;
 
   error ("conversion to non-scalar type requested");
   return error_mark_node;