From 0244e6f7e07176d02c4135e64e776bc117553c90 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Wed, 9 Jun 2010 15:18:40 +0000 Subject: call.c (build_java_interface_fn_ref): Call build_function_type_list instead of build_function_type. * call.c (build_java_interface_fn_ref): Call build_function_type_list instead of build_function_type. * decl.c (cxx_init_decl_processing): Likewise. (declare_global_var): Likewise. (get_atexit_node): Likewise. (expand_static_init): Likewise. * decl2.c (start_objects): Likewise. (start_static_storage_duration_function): Likewise. * except.c (init_exception_processing): Likewise. (build_exc_ptr): Likewise. (build_throw): Likewise. * rtti.c (throw_bad_cast): Likewise. (throw_bad_typeid): Likewise. (build_dynamic_cast_1): Likewise. From-SVN: r160486 --- gcc/cp/rtti.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'gcc/cp/rtti.c') diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c index 12d1784..dde8e82 100644 --- a/gcc/cp/rtti.c +++ b/gcc/cp/rtti.c @@ -207,8 +207,8 @@ throw_bad_cast (void) { tree fn = get_identifier ("__cxa_bad_cast"); if (!get_global_value_if_present (fn, &fn)) - fn = push_throw_library_fn (fn, build_function_type (ptr_type_node, - void_list_node)); + fn = push_throw_library_fn (fn, build_function_type_list (ptr_type_node, + NULL_TREE)); return build_cxx_call (fn, 0, NULL); } @@ -225,7 +225,7 @@ throw_bad_typeid (void) tree t; t = build_reference_type (const_type_info_type_node); - t = build_function_type (t, void_list_node); + t = build_function_type_list (t, NULL_TREE); fn = push_throw_library_fn (fn, t); } @@ -729,12 +729,10 @@ build_dynamic_cast_1 (tree type, tree expr, tsubst_flags_t complain) (cp_build_qualified_type (tinfo_ptr, TYPE_QUAL_CONST)); name = "__dynamic_cast"; - tmp = tree_cons - (NULL_TREE, const_ptr_type_node, tree_cons - (NULL_TREE, tinfo_ptr, tree_cons - (NULL_TREE, tinfo_ptr, tree_cons - (NULL_TREE, ptrdiff_type_node, void_list_node)))); - tmp = build_function_type (ptr_type_node, tmp); + tmp = build_function_type_list (ptr_type_node, + const_ptr_type_node, + tinfo_ptr, tinfo_ptr, + ptrdiff_type_node, NULL_TREE); dcast_fn = build_library_fn_ptr (name, tmp); DECL_PURE_P (dcast_fn) = 1; pop_abi_namespace (); -- cgit v1.1