* cfgexpand.c (expand_call_stmt): Convert the function type to the

	original one if this is not a builtin function.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7808f4c..9051d43 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,7 +1,7 @@
-2011-04-14  Eric Botcazou  <ebotcazou@adacore.com>
+2011-04-15  Eric Botcazou  <ebotcazou@adacore.com>
 
-       * cfgexpand.c (expand_call_stmt): Rematerialize the original function
-       type if this is not a builtin function.
+       * cfgexpand.c (expand_call_stmt): Convert the function type to the
+       original one if this is not a builtin function.
 
 2011-04-14  Jakub Jelinek  <jakub@redhat.com>
 

diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 45a6383..c2d71f4 100644 (file)
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -1851,8 +1851,8 @@ expand_call_stmt (gimple stmt)
      call is made may be different from the type of the function.  */
   if (!builtin_p)
     CALL_EXPR_FN (exp)
-      = fold_build1 (NOP_EXPR, build_pointer_type (gimple_call_fntype (stmt)),
-                    CALL_EXPR_FN (exp));
+      = fold_convert (build_pointer_type (gimple_call_fntype (stmt)),
+                     CALL_EXPR_FN (exp));
 
   TREE_TYPE (exp) = gimple_call_return_type (stmt);
   CALL_EXPR_STATIC_CHAIN (exp) = gimple_call_chain (stmt);