gcc/

	* tree.c (build_function_type_list_1): Remove bogus assert condition.

gcc/fortran/
	* trans-types.c (gfc_init_types): Use build_function_type_list.
	(gfc_get_ppc_type): Likewise.
	* trans-decl.c (gfc_generate_constructors): Likewise.
	* f95-lang.c (build_builtin_fntypes): Likewise.
	(gfc_init_builtin_functions): Likewise.
	(DEF_FUNCTION_TYPE_0): Likewise.
	(DEF_FUNCTION_TYPE_1): Likewise.
	(DEF_FUNCTION_TYPE_2): Likewise.
	(DEF_FUNCTION_TYPE_3): Likewise.
	(DEF_FUNCTION_TYPE_4): Likewise.
	(DEF_FUNCTION_TYPE_5): Likewise.
	(DEF_FUNCTION_TYPE_6): Likewise.
	(DEF_FUNCTION_TYPE_7): Likewise.  Use ARG7.
	(DEF_FUNCTION_TYPE_VAR_0): Use build_varags_function_type_list.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6d2ce39..a469dee 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-17  Nathan Froyd  <froydnj@codesourcery.com>
+ 
+       * tree.c (build_function_type_list_1): Remove bogus assert condition.
+ 
 2010-05-17  Alan Modra  <amodra@gmail.com>
 
        * config/rs6000/rs6000.c (rs6000_emit_allocate_stack): Delete

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a1fec13..73dd06d 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,20 @@
+2010-05-17  Nathan Froyd  <froydnj@codesourcery.com
+
+       * trans-types.c (gfc_init_types): Use build_function_type_list.
+       (gfc_get_ppc_type): Likewise.
+       * trans-decl.c (gfc_generate_constructors): Likewise.
+       * f95-lang.c (build_builtin_fntypes): Likewise.
+       (gfc_init_builtin_functions): Likewise.
+       (DEF_FUNCTION_TYPE_0): Likewise.
+       (DEF_FUNCTION_TYPE_1): Likewise.
+       (DEF_FUNCTION_TYPE_2): Likewise.
+       (DEF_FUNCTION_TYPE_3): Likewise.
+       (DEF_FUNCTION_TYPE_4): Likewise.
+       (DEF_FUNCTION_TYPE_5): Likewise.
+       (DEF_FUNCTION_TYPE_6): Likewise.
+       (DEF_FUNCTION_TYPE_7): Likewise.  Use ARG7.
+       (DEF_FUNCTION_TYPE_VAR_0): Use build_varags_function_type_list.
+ 
 2010-05-17  Nathan Froyd  <froydnj@cs.rice.edu>
 
        * trans-array.c (gfc_trans_array_constructor_value): Use

diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 7facc8d..e24390b 100644 (file)
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -4633,8 +4633,7 @@ gfc_generate_constructors (void)
     return;
 
   fnname = get_file_function_name ("I");
-  type = build_function_type (void_type_node,
-                             gfc_chainon_list (NULL_TREE, void_type_node));
+  type = build_function_type_list (void_type_node, NULL_TREE);
 
   fndecl = build_decl (input_location,
                       FUNCTION_DECL, fnname, type);

diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c
index dca19ce..fa214fd 100644 (file)
--- a/gcc/fortran/trans-types.c
+++ b/gcc/fortran/trans-types.c
@@ -870,7 +870,7 @@ gfc_init_types (void)
   ppvoid_type_node = build_pointer_type (pvoid_type_node);
   pchar_type_node = build_pointer_type (gfc_character1_type_node);
   pfunc_type_node
-    = build_pointer_type (build_function_type (void_type_node, NULL_TREE));
+    = build_pointer_type (build_function_type_list (void_type_node, NULL_TREE));
 
   gfc_array_index_type = gfc_get_int_type (gfc_index_integer_kind);
   /* We cannot use gfc_index_zero_node in definition of gfc_array_range_type,
@@ -1934,7 +1934,7 @@ gfc_get_ppc_type (gfc_component* c)
   else
     t = void_type_node;
 
-  return build_pointer_type (build_function_type (t, NULL_TREE));
+  return build_pointer_type (build_function_type_list (t, NULL_TREE));
 }
 
 

diff --git a/gcc/tree.c b/gcc/tree.c
index 3c456a2..00de313 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -7330,7 +7330,7 @@ build_function_type_list_1 (bool vaargs, tree return_type, va_list argp)
       last = args;
       if (args != NULL_TREE)
        args = nreverse (args);
-      gcc_assert (args != NULL_TREE && last != void_list_node);
+      gcc_assert (last != void_list_node);
     }
   else if (args == NULL_TREE)
     args = void_list_node;