From 0ac1b88953853f4ae1cd2fd09d40fb85fe0d3de5 Mon Sep 17 00:00:00 2001 From: Gabriel Dos Reis Date: Fri, 2 Dec 2005 11:21:28 +0000 Subject: [PATCH] decl2.c (get_priority_info): Use XNEW, not xmalloc. * decl2.c (get_priority_info): Use XNEW, not xmalloc. * decl.c (push_switch): Likewise. * lex.c (handle_pragma_implementation): Likewise. * cp-objcp-common.c (decl_shadowed_for_var_insert): Use GGC_NEW, not ggc_alloc. (cxx_initialize_diagnostics): Use XNEW, not xmalloc. * class.c (init_class_processing): Use XNEWVEC, not xmalloc. * g++spec.c (lang_specific_driver): Likewise. * mangle.c (save_partially_mangled_name): Likewise. * parser.c (cp_lexer_new_main): Use GGC_NEWVEC, not ggc_alloc. (cp_parser_template_argument_list): Use XNEWVEC, nto xmalloc. (cp_parser_sizeof_operand): Likewise. * repo.c (open_repo_file, open_repo_file): Likewise. From-SVN: r107884 --- gcc/cp/ChangeLog | 16 ++++++++++++++++ gcc/cp/class.c | 2 +- gcc/cp/cp-objcp-common.c | 4 ++-- gcc/cp/decl.c | 2 +- gcc/cp/decl2.c | 2 +- gcc/cp/g++spec.c | 2 +- gcc/cp/lex.c | 2 +- gcc/cp/mangle.c | 2 +- gcc/cp/parser.c | 6 +++--- gcc/cp/repo.c | 2 +- 10 files changed, 28 insertions(+), 12 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 209f403bcb8..b0ba117ae1a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,19 @@ +2005-12-02 Gabriel Dos Reis + + * decl2.c (get_priority_info): Use XNEW, not xmalloc. + * decl.c (push_switch): Likewise. + * lex.c (handle_pragma_implementation): Likewise. + * cp-objcp-common.c (decl_shadowed_for_var_insert): Use GGC_NEW, + not ggc_alloc. + (cxx_initialize_diagnostics): Use XNEW, not xmalloc. + * class.c (init_class_processing): Use XNEWVEC, not xmalloc. + * g++spec.c (lang_specific_driver): Likewise. + * mangle.c (save_partially_mangled_name): Likewise. + * parser.c (cp_lexer_new_main): Use GGC_NEWVEC, not ggc_alloc. + (cp_parser_template_argument_list): Use XNEWVEC, nto xmalloc. + (cp_parser_sizeof_operand): Likewise. + * repo.c (open_repo_file, open_repo_file): Likewise. + 2005-12-01 Gabriel Dos Reis * parser.c (cp_parser_make_typename_type): Call make_typename_type diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 647b7cb67b9..5c1b9e11582 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -5334,7 +5334,7 @@ init_class_processing (void) current_class_depth = 0; current_class_stack_size = 10; current_class_stack - = xmalloc (current_class_stack_size * sizeof (struct class_stack_node)); + = XNEWVEC (struct class_stack_node, current_class_stack_size); local_classes = VEC_alloc (tree, gc, 8); sizeof_biggest_empty_class = size_zero_node; diff --git a/gcc/cp/cp-objcp-common.c b/gcc/cp/cp-objcp-common.c index 43a7576bcd4..7a4d862336c 100644 --- a/gcc/cp/cp-objcp-common.c +++ b/gcc/cp/cp-objcp-common.c @@ -154,7 +154,7 @@ void cxx_initialize_diagnostics (diagnostic_context *context) { pretty_printer *base = context->printer; - cxx_pretty_printer *pp = xmalloc (sizeof (cxx_pretty_printer)); + cxx_pretty_printer *pp = XNEW (cxx_pretty_printer); memcpy (pp_base (pp), base, sizeof (pretty_printer)); pp_cxx_pretty_printer_init (pp); context->printer = (pretty_printer *) pp; @@ -229,7 +229,7 @@ decl_shadowed_for_var_insert (tree from, tree to) struct tree_map *h; void **loc; - h = ggc_alloc (sizeof (struct tree_map)); + h = GGC_NEW (struct tree_map); h->hash = htab_hash_pointer (from); h->from = from; h->to = to; diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index dec134a1fde..71aac1a1717 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -2431,7 +2431,7 @@ static struct cp_switch *switch_stack; void push_switch (tree switch_stmt) { - struct cp_switch *p = xmalloc (sizeof (struct cp_switch)); + struct cp_switch *p = XNEW (struct cp_switch); p->level = current_binding_level; p->next = switch_stack; p->switch_stmt = switch_stmt; diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index dcf3217dfb3..8c65d946a97 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -2301,7 +2301,7 @@ get_priority_info (int priority) { /* Create a new priority information structure, and insert it into the map. */ - pi = xmalloc (sizeof (struct priority_info_s)); + pi = XNEW (struct priority_info_s); pi->initializations_p = 0; pi->destructions_p = 0; splay_tree_insert (priority_info_map, diff --git a/gcc/cp/g++spec.c b/gcc/cp/g++spec.c index 36cf6c6827f..ec7cefcb3e6 100644 --- a/gcc/cp/g++spec.c +++ b/gcc/cp/g++spec.c @@ -252,7 +252,7 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, /* Make sure to have room for the trailing NULL argument. */ num_args = argc + added + need_math + shared_libgcc + (library > 0) + 1; - arglist = xmalloc (num_args * sizeof (char *)); + arglist = XNEWVEC (const char *, num_args); i = 0; j = 0; diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c index 4ed1077bd37..469efc83971 100644 --- a/gcc/cp/lex.c +++ b/gcc/cp/lex.c @@ -571,7 +571,7 @@ handle_pragma_implementation (cpp_reader* dfile ATTRIBUTE_UNUSED ) } if (ifiles == 0) { - ifiles = xmalloc (sizeof (struct impl_files)); + ifiles = XNEW (struct impl_files); ifiles->filename = filename; ifiles->next = impl_file_chain; impl_file_chain = ifiles; diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index b07012252bb..c654d764bbd 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -276,7 +276,7 @@ save_partially_mangled_name (void) { gcc_assert (!partially_mangled_name); partially_mangled_name_len = obstack_object_size (mangle_obstack); - partially_mangled_name = xmalloc (partially_mangled_name_len); + partially_mangled_name = XNEWVEC (char, partially_mangled_name_len); memcpy (partially_mangled_name, obstack_base (mangle_obstack), partially_mangled_name_len); obstack_free (mangle_obstack, obstack_finish (mangle_obstack)); diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index e5b43b0d4af..431642255c5 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -271,7 +271,7 @@ cp_lexer_new_main (void) /* Create the buffer. */ alloc = CP_LEXER_BUFFER_SIZE; - buffer = ggc_alloc (alloc * sizeof (cp_token)); + buffer = GGC_NEWVEC (cp_token, alloc); /* Put the first token in the buffer. */ space = alloc; @@ -8930,7 +8930,7 @@ cp_parser_template_argument_list (cp_parser* parser) if (arg_ary == fixed_args) { - arg_ary = xmalloc (sizeof (tree) * alloced); + arg_ary = XNEWVEC (tree, alloced); memcpy (arg_ary, fixed_args, sizeof (tree) * n_args); } else @@ -15770,7 +15770,7 @@ cp_parser_sizeof_operand (cp_parser* parser, enum rid keyword) saved_message = parser->type_definition_forbidden_message; /* And create the new one. */ parser->type_definition_forbidden_message - = xmalloc (strlen (format) + = XNEWVEC (const char, strlen (format) + strlen (IDENTIFIER_POINTER (ridpointers[keyword])) + 1 /* `\0' */); sprintf ((char *) parser->type_definition_forbidden_message, diff --git a/gcc/cp/repo.c b/gcc/cp/repo.c index eee3b87f8d3..d2fae3e0a17 100644 --- a/gcc/cp/repo.c +++ b/gcc/cp/repo.c @@ -132,7 +132,7 @@ open_repo_file (const char *filename) if (! p) p = s + strlen (s); - repo_name = xmalloc (p - s + 5); + repo_name = XNEWVEC (char, p - s + 5); memcpy (repo_name, s, p - s); memcpy (repo_name + (p - s), ".rpo", 5);