re PR fortran/48174 (DWARF for subroutine with no args indicates 'varargs')

2011-03-25  Tobias Burnus  <burnus@net-b.de>

        PR fortran/48174
        PR fortran/45304
        * trans-types.c (gfc_get_function_type): Don't use varargs if
        * the
        procedure is known to have no arguments.

2011-03-25  Tobias Burnus  <burnus@net-b.de>

        PR fortran/48174
        PR fortran/45304
        * gfortran.dg/ishft_4.f90: Adapt scan-tree-dump-times.
        * gfortran.dg/leadz_trailz_3.f90: Ditto

From-SVN: r171519

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 4e0a792c1a84e9ef95e34715ab9949078bc59f8f..34c7c03cab33cc035e526cdf5e676de616c76009 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-25  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/48174
+       PR fortran/45304
+       * trans-types.c (gfc_get_function_type): Don't use varargs if the
+       procedure is known to have no arguments.
+
 2010-03-21  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
        PR fortran/22572

diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c
index 258685e1017f1a7c2e283e64ac273976eb304411..8ecceea8ffd4d52490f0453ed0f1bc735406da60 100644 (file)
--- a/gcc/fortran/trans-types.c
+++ b/gcc/fortran/trans-types.c
@@ -2618,7 +2618,7 @@ gfc_get_function_type (gfc_symbol * sym)
 
   if (typelist)
     typelist = chainon (typelist, void_list_node);
-  else if (sym->attr.is_main_program)
+  else if (sym->attr.is_main_program || sym->attr.if_source != IFSRC_UNKNOWN)
     typelist = void_list_node;
 
   if (alternate_return)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c7e866216d4d69f5d519be83caa14db3a6d32149..d2a1762798e8f9e23adfdf13b07ae7189398fc4e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-25  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/48174
+       PR fortran/45304
+       * gfortran.dg/ishft_4.f90: Adapt scan-tree-dump-times.
+       * gfortran.dg/leadz_trailz_3.f90: Ditto
+
 2011-03-25  Martin Jambor  <mjambor@suse.cz>
 
        * gcc.c-torture/compile/pr44686.c: Do not explicitely specify -O2.

diff --git a/gcc/testsuite/gfortran.dg/ishft_4.f90 b/gcc/testsuite/gfortran.dg/ishft_4.f90
index 0315c7feb91ab048d72c07b4ece7c12171802587..4e2ad2b137f6acf1aa9404c8de8e6e0568eb0197 100644 (file)
--- a/gcc/testsuite/gfortran.dg/ishft_4.f90
+++ b/gcc/testsuite/gfortran.dg/ishft_4.f90
@@ -35,6 +35,6 @@ end program
 !   -- once in the function definition itself
 !   -- plus as many times as the function is called
 !
-! { dg-final { scan-tree-dump-times "foo *\\\(\\\)" 6 "original" } }
-! { dg-final { scan-tree-dump-times "bar *\\\(\\\)" 6 "original" } }
+! { dg-final { scan-tree-dump-times "foo *\\\(\\\)" 5 "original" } }
+! { dg-final { scan-tree-dump-times "bar *\\\(\\\)" 5 "original" } }
 ! { dg-final { cleanup-tree-dump "original" } }

diff --git a/gcc/testsuite/gfortran.dg/leadz_trailz_3.f90 b/gcc/testsuite/gfortran.dg/leadz_trailz_3.f90
index f8466ffb95da501c884dd3c5199c2c7fe6203008..b54a11f63da5d51585a280d533e471d100042c43 100644 (file)
--- a/gcc/testsuite/gfortran.dg/leadz_trailz_3.f90
+++ b/gcc/testsuite/gfortran.dg/leadz_trailz_3.f90
@@ -26,5 +26,5 @@ end program
 !   -- once in the function definition itself
 !   -- plus as many times as the function is called
 !
-! { dg-final { scan-tree-dump-times "foo *\\\(\\\)" 8 "original" } }
+! { dg-final { scan-tree-dump-times "foo *\\\(\\\)" 7 "original" } }
 ! { dg-final { cleanup-tree-dump "original" } }