From patchwork Tue May 10 13:17:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Froyd X-Patchwork-Id: 94989 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 19E601007D5 for ; Tue, 10 May 2011 23:17:53 +1000 (EST) Received: (qmail 27696 invoked by alias); 10 May 2011 13:17:52 -0000 Received: (qmail 27685 invoked by uid 22791); 10 May 2011 13:17:51 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 10 May 2011 13:17:35 +0000 Received: (qmail 18809 invoked from network); 10 May 2011 13:17:35 -0000 Received: from unknown (HELO localhost) (froydnj@127.0.0.2) by mail.codesourcery.com with ESMTPA; 10 May 2011 13:17:35 -0000 Date: Tue, 10 May 2011 06:17:35 -0700 From: Nathan Froyd To: gcc-patches@gcc.gnu.org Subject: [PATCH] don't use build_function_type in the Ada FE Message-ID: <20110510131734.GU23480@codesourcery.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.17+20080114 (2008-01-14) X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org As $SUBJECT suggests. Rather pleasant how easy this was. Tested on x86_64-unknown-linux-gnu. OK to commit? -Nathan gcc/ada/ * gcc-interface/utils.c (def_fn_type): Don't call build_function_type; call build_function_type_vec or build_varargs_function_type_vec instead. (create_subprog_type): Likewise. diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c index cfa58b9..efeceea 100644 --- a/gcc/ada/gcc-interface/utils.c +++ b/gcc/ada/gcc-interface/utils.c @@ -1181,24 +1181,16 @@ create_subprog_type (tree return_type, tree param_decl_list, tree cico_list, bool return_unconstrained_p, bool return_by_direct_ref_p, bool return_by_invisi_ref_p) { - /* A chain of TREE_LIST nodes whose TREE_VALUEs are the data type nodes of - the subprogram formal parameters. This list is generated by traversing - the input list of PARM_DECL nodes. */ - tree param_type_list = NULL_TREE; + /* A list of the data type nodes of the subprogram formal parameters. + This list is generated by traversing the input list of PARM_DECL + nodes. */ + VEC(tree,gc) *param_type_list = NULL; tree t, type; for (t = param_decl_list; t; t = DECL_CHAIN (t)) - param_type_list = tree_cons (NULL_TREE, TREE_TYPE (t), param_type_list); + VEC_safe_push (tree, gc, param_type_list, TREE_TYPE (t)); - /* The list of the function parameter types has to be terminated by the void - type to signal to the back-end that we are not dealing with a variable - parameter subprogram, but that it has a fixed number of parameters. */ - param_type_list = tree_cons (NULL_TREE, void_type_node, param_type_list); - - /* The list of argument types has been created in reverse so reverse it. */ - param_type_list = nreverse (param_type_list); - - type = build_function_type (return_type, param_type_list); + type = build_function_type_vec (return_type, param_type_list); /* TYPE may have been shared since GCC hashes types. If it has a different CICO_LIST, make a copy. Likewise for the various flags. */ @@ -4959,7 +4951,8 @@ static GTY(()) tree builtin_types[(int) BT_LAST + 1]; static void def_fn_type (builtin_type def, builtin_type ret, bool var, int n, ...) { - tree args = NULL, t; + tree t; + tree *args = XALLOCAVEC (tree, n); va_list list; int i; @@ -4970,18 +4963,17 @@ def_fn_type (builtin_type def, builtin_type ret, bool var, int n, ...) t = builtin_types[a]; if (t == error_mark_node) goto egress; - args = tree_cons (NULL_TREE, t, args); + args[i] = t; } va_end (list); - args = nreverse (args); - if (!var) - args = chainon (args, void_list_node); - t = builtin_types[ret]; if (t == error_mark_node) goto egress; - t = build_function_type (t, args); + if (var) + t = build_varargs_function_type_array (t, n, args); + else + t = build_function_type_array (t, n, args); egress: builtin_types[def] = t;