2010-06-22 Ed Schonberg <schonberg@adacore.com>

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

diff --git a/gcc/fortran/convert.c b/gcc/fortran/convert.c
index 73d7a6d..f69ea23 100644 (file)
--- a/gcc/fortran/convert.c
+++ b/gcc/fortran/convert.c
@@ -1,11 +1,12 @@
 /* Language-level data type conversion for GNU C.
-   Copyright (C) 1987, 1988, 1991, 1998, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1988, 1991, 1998, 2002, 2007, 2008
+   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
-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
@@ -14,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
-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
@@ -40,7 +40,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #include "tree.h"
 #include "flags.h"
 #include "convert.h"
-#include "toplev.h"
+#include "toplev.h"    /* For error.  */
 #include "gfortran.h"
 #include "trans.h"
 
@@ -57,9 +57,8 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
      In expr.c: expand_expr, for operands of a MULT_EXPR.
      In fold-const.c: fold.
      In tree.c: get_narrower and get_unwidened.  */
-\f
+
 /* Subroutines of `convert'.  */
-\f
 
 
 /* Create an expression whose value is that of EXPR,
@@ -90,7 +89,7 @@ convert (tree type, tree expr)
       return error_mark_node;
     }
   if (code == VOID_TYPE)
-    return build1 (CONVERT_EXPR, type, e);
+    return fold_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.  */
@@ -104,7 +103,7 @@ convert (tree type, tree expr)
       e = gfc_truthvalue_conversion (e);
 
       /* If we have a NOP_EXPR, we must fold it here to avoid
-         infinite recursion between fold () and convert ().  */
+        infinite recursion between fold () and convert ().  */
       if (TREE_CODE (e) == NOP_EXPR)
        return fold_build1 (NOP_EXPR, type, TREE_OPERAND (e, 0));
       else