[gfortran,committed] Fix type mismatch from my previous NINT patch

[gfortran,committed] Fix type mismatch from my previous NINT patch

[FX Coudert]

[-- Attachment #1: Type: text/plain, Size: 161 bytes --]

Attached patch fixes a type mismatch that was introduced by my recent  
NINT patch. Committed after regtesting on x86_64-linux, with both - 
m32 and -m64.

FX



[-- Attachment #2: foo.diff --]
[-- Type: application/octet-stream, Size: 1825 bytes --]

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 127493)
+++ ChangeLog	(working copy)
@@ -1,5 +1,11 @@
 2007-08-14  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
+	PR fortran/33073
+	* trans-intrinsic.c (build_fixbound_expr): Convert to result type
+	in all cases.
+
+2007-08-14  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
 	PR fortran/32594
 	* trans-expr.c (gfc_conv_substring_expr): Only call
 	gfc_conv_substring if expr->ref is not NULL.
Index: trans-intrinsic.c
===================================================================
--- trans-intrinsic.c	(revision 127493)
+++ trans-intrinsic.c	(working copy)
@@ -314,10 +314,9 @@ build_fixbound_expr (stmtblock_t * pbloc
 static tree
 build_round_expr (tree arg, tree restype)
 {
-  tree tmp;
   tree argtype;
   tree fn;
-  bool longlong, convert;
+  bool longlong;
   int argprec, resprec;
 
   argtype = TREE_TYPE (arg);
@@ -328,21 +327,9 @@ build_round_expr (tree arg, tree restype
      (lround family) or long long intrinsic (llround).  We might also
      need to convert the result afterwards.  */
   if (resprec <= LONG_TYPE_SIZE)
-    {
-      longlong = false;
-      if (resprec != LONG_TYPE_SIZE)
-	convert = true;
-      else
-	convert = false;
-    }
+    longlong = false;
   else if (resprec <= LONG_LONG_TYPE_SIZE)
-    {
-      longlong = true;
-      if (resprec != LONG_LONG_TYPE_SIZE)
-	convert = true;
-      else
-	convert = false;
-    }
+    longlong = true;
   else
     gcc_unreachable ();
 
@@ -356,10 +343,7 @@ build_round_expr (tree arg, tree restype
   else
     gcc_unreachable ();
 
-  tmp = build_call_expr (fn, 1, arg);
-  if (convert)
-    tmp = fold_convert (restype, tmp);
-  return tmp;
+  return fold_convert (restype, build_call_expr (fn, 1, arg));
 }