From 25c0cad4febcc3c1297ccf500559fa76af4b3b18 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 19 Feb 2010 19:31:01 +0100 Subject: [PATCH] ipa-struct-reorg.c (make_field_acc_node, [...]): Use XCNEW instead of xcalloc. * ipa-struct-reorg.c (make_field_acc_node, gen_cluster, peel_field): Use XCNEW instead of xcalloc. (add_access_to_acc_sites, create_new_var_node, add_alloc_site): Use XNEW instead of xmalloc. (get_fields): Use XNEWVEC instead of xmalloc. From-SVN: r156905 --- gcc/ChangeLog | 6 ++++++ gcc/ipa-struct-reorg.c | 22 +++++++--------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 850880ad37f..ce842ff64bc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2010-02-19 Jakub Jelinek + * ipa-struct-reorg.c (make_field_acc_node, gen_cluster, peel_field): + Use XCNEW instead of xcalloc. + (add_access_to_acc_sites, create_new_var_node, add_alloc_site): Use + XNEW instead of xmalloc. + (get_fields): Use XNEWVEC instead of xmalloc. + PR debug/43084 * ipa-struct-reorg.c (add_access_to_acc_sites): For debug stmts don't populate vars array. diff --git a/gcc/ipa-struct-reorg.c b/gcc/ipa-struct-reorg.c index 66b3ab40d23..e0336aa1a13 100644 --- a/gcc/ipa-struct-reorg.c +++ b/gcc/ipa-struct-reorg.c @@ -447,9 +447,7 @@ decompose_access (tree str_decl, struct field_access_site *acc) static inline struct field_access_site * make_field_acc_node (void) { - int size = sizeof (struct field_access_site); - - return (struct field_access_site *) xcalloc (1, size); + return XCNEW (struct field_access_site); } /* This function returns the structure field access, defined by STMT, @@ -495,7 +493,7 @@ add_access_to_acc_sites (gimple stmt, tree var, htab_t accs) { void **slot; - acc = (struct access_site *) xmalloc (sizeof (struct access_site)); + acc = XNEW (struct access_site); acc->stmt = stmt; if (!is_gimple_debug (stmt)) acc->vars = VEC_alloc (tree, heap, 10); @@ -2000,7 +1998,7 @@ create_new_var_node (tree var, d_str str) { new_var node; - node = (new_var) xmalloc (sizeof (struct new_var_data)); + node = XNEW (struct new_var_data); node->orig_var = var; node->new_vars = VEC_alloc (tree, heap, VEC_length (tree, str->new_types)); return node; @@ -2341,8 +2339,7 @@ get_fields (tree struct_decl, int num_fields) tree t = TYPE_FIELDS (struct_decl); int idx = 0; - list = - (struct field_entry *) xmalloc (num_fields * sizeof (struct field_entry)); + list = XNEWVEC (struct field_entry, num_fields); for (idx = 0 ; t; t = TREE_CHAIN (t), idx++) if (TREE_CODE (t) == FIELD_DECL) @@ -3038,8 +3035,7 @@ add_alloc_site (tree fn_decl, gimple stmt, d_str str) { void **slot; - fallocs = (fallocs_t) - xmalloc (sizeof (struct func_alloc_sites)); + fallocs = XNEW (struct func_alloc_sites); fallocs->func = fn_decl; fallocs->allocs = VEC_alloc (alloc_site_t, heap, 1); slot = htab_find_slot_with_hash (alloc_sites, fn_decl, @@ -3194,10 +3190,8 @@ collect_accesses_in_bb (basic_block bb) static void gen_cluster (sbitmap fields, d_str str) { - struct field_cluster *crr_cluster = NULL; + struct field_cluster *crr_cluster = XCNEW (struct field_cluster); - crr_cluster = - (struct field_cluster *) xcalloc (1, sizeof (struct field_cluster)); crr_cluster->sibling = str->struct_clustering; str->struct_clustering = crr_cluster; crr_cluster->fields_in_cluster = fields; @@ -3208,10 +3202,8 @@ gen_cluster (sbitmap fields, d_str str) static void peel_field (int i, d_str ds) { - struct field_cluster *crr_cluster = NULL; + struct field_cluster *crr_cluster = XCNEW (struct field_cluster); - crr_cluster = - (struct field_cluster *) xcalloc (1, sizeof (struct field_cluster)); crr_cluster->sibling = ds->struct_clustering; ds->struct_clustering = crr_cluster; crr_cluster->fields_in_cluster = -- 2.30.2