summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorburnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>2009-08-05 20:47:19 +0000
committerburnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>2009-08-05 20:47:19 +0000
commit5c1af02a15fcdbc574a8de9975f29a27b535cdba (patch)
tree59fac2535e3b1595093824e639fead3523ff2070 /gcc
parent077ad5adc3dfba339db1bb33ba59cc4a85ad7ed4 (diff)
downloadgcc-5c1af02a15fcdbc574a8de9975f29a27b535cdba.tar.gz
2009-08-05 Tobias Burnus <burnus@net-b.de>
PR fortran/40969 Revert: 2009-08-04 Tobias Burnus <burnus@net-b.de> PR fortran/40949 * trans-types.c (gfc_get_function_type): Fix typelist of functions without argument. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@150500 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog10
-rw-r--r--gcc/fortran/trans-types.c3
2 files changed, 12 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 72b6b85e224..a34b2c21cfa 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,13 @@
+2009-08-05 Tobias Burnus <burnus@net-b.de>
+
+ PR fortran/40969
+ Revert:
+ 2009-08-04 Tobias Burnus <burnus@net-b.de>
+
+ PR fortran/40949
+ * trans-types.c (gfc_get_function_type): Fix typelist of
+ functions without argument.
+
2009-08-05 Paul Thomas <pault@gcc.gnu.org>
PR fortran/40847
diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c
index 5ae9a00517f..92373e1b1a2 100644
--- a/gcc/fortran/trans-types.c
+++ b/gcc/fortran/trans-types.c
@@ -2324,7 +2324,8 @@ gfc_get_function_type (gfc_symbol * sym)
while (nstr--)
typelist = gfc_chainon_list (typelist, gfc_charlen_type_node);
- typelist = gfc_chainon_list (typelist, void_type_node);
+ if (typelist)
+ typelist = gfc_chainon_list (typelist, void_type_node);
if (alternate_return)
type = integer_type_node;