diff options
| -rw-r--r-- | gcc/ChangeLog | 24 | ||||
| -rw-r--r-- | gcc/cgraph.h | 40 | ||||
| -rw-r--r-- | gcc/ipa-utils.c | 257 | ||||
| -rw-r--r-- | gcc/ipa.c | 314 | ||||
| -rw-r--r-- | gcc/lto/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/lto/lto.c | 28 | ||||
| -rw-r--r-- | gcc/passes.c | 4 | ||||
| -rw-r--r-- | gcc/tree-emutls.c | 2 |
8 files changed, 324 insertions, 353 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 61539c785cd..f824ed6e4fa 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,27 @@ +2011-05-03 Jan Hubicka <jh@suse.cz> + + * cgraph.h (cgraph_node_set_def, varpool_node_set_def): Move out of GTY; + replace hash by pointer map. + (cgraph_node_set_element_def, cgraph_node_set_element, + const_cgraph_node_set_element, varpool_node_set_element_def, + varpool_node_set_element, const_varpool_node_set_element): Remove. + (free_cgraph_node_set, free_varpool_node_set): New function. + (cgraph_node_set_size, varpool_node_set_size): Use vector size. + * tree-emutls.c: Free varpool node set. + * ipa-utils.c (cgraph_node_set_new, cgraph_node_set_add, + cgraph_node_set_remove, cgraph_node_set_find, dump_cgraph_node_set, + debug_cgraph_node_set, free_cgraph_node_set, varpool_node_set_new, + varpool_node_set_add, varpool_node_set_remove, varpool_node_set_find, + dump_varpool_node_set, free_varpool_node_set, debug_varpool_node_set): + Move here from ipa.c; implement using pointer_map + * ipa.c (cgraph_node_set_new, cgraph_node_set_add, + cgraph_node_set_remove, cgraph_node_set_find, dump_cgraph_node_set, + debug_cgraph_node_set, varpool_node_set_new, + varpool_node_set_add, varpool_node_set_remove, varpool_node_set_find, + dump_varpool_node_set, debug_varpool_node_set): + Move to ipa-uitls.c. + * passes.c (ipa_write_summaries): Update. + 2011-05-03 Stuart Henderson <shenders@gcc.gnu.org> From Mike Frysinger: diff --git a/gcc/cgraph.h b/gcc/cgraph.h index 251b9c882d5..35d1a9d791c 100644 --- a/gcc/cgraph.h +++ b/gcc/cgraph.h @@ -256,10 +256,10 @@ DEF_VEC_ALLOC_P(cgraph_node_ptr,gc); /* A cgraph node set is a collection of cgraph nodes. A cgraph node can appear in multiple sets. */ -struct GTY(()) cgraph_node_set_def +struct cgraph_node_set_def { - htab_t GTY((param_is (struct cgraph_node_set_element_def))) hashtab; - VEC(cgraph_node_ptr, gc) *nodes; + struct pointer_map_t *map; + VEC(cgraph_node_ptr, heap) *nodes; }; typedef struct varpool_node *varpool_node_ptr; @@ -270,10 +270,10 @@ DEF_VEC_ALLOC_P(varpool_node_ptr,gc); /* A varpool node set is a collection of varpool nodes. A varpool node can appear in multiple sets. */ -struct GTY(()) varpool_node_set_def +struct varpool_node_set_def { - htab_t GTY((param_is (struct varpool_node_set_element_def))) hashtab; - VEC(varpool_node_ptr, gc) *nodes; + struct pointer_map_t * map; + VEC(varpool_node_ptr, heap) *nodes; }; typedef struct cgraph_node_set_def *cgraph_node_set; @@ -288,17 +288,6 @@ DEF_VEC_P(varpool_node_set); DEF_VEC_ALLOC_P(varpool_node_set,gc); DEF_VEC_ALLOC_P(varpool_node_set,heap); -/* A cgraph node set element contains an index in the vector of nodes in - the set. */ -struct GTY(()) cgraph_node_set_element_def -{ - struct cgraph_node *node; - HOST_WIDE_INT index; -}; - -typedef struct cgraph_node_set_element_def *cgraph_node_set_element; -typedef const struct cgraph_node_set_element_def *const_cgraph_node_set_element; - /* Iterator structure for cgraph node sets. */ typedef struct { @@ -306,17 +295,6 @@ typedef struct unsigned index; } cgraph_node_set_iterator; -/* A varpool node set element contains an index in the vector of nodes in - the set. */ -struct GTY(()) varpool_node_set_element_def -{ - struct varpool_node *node; - HOST_WIDE_INT index; -}; - -typedef struct varpool_node_set_element_def *varpool_node_set_element; -typedef const struct varpool_node_set_element_def *const_varpool_node_set_element; - /* Iterator structure for varpool node sets. */ typedef struct { @@ -632,6 +610,7 @@ void cgraph_node_set_add (cgraph_node_set, struct cgraph_node *); void cgraph_node_set_remove (cgraph_node_set, struct cgraph_node *); void dump_cgraph_node_set (FILE *, cgraph_node_set); void debug_cgraph_node_set (cgraph_node_set); +void free_cgraph_node_set (cgraph_node_set); varpool_node_set varpool_node_set_new (void); varpool_node_set_iterator varpool_node_set_find (varpool_node_set, @@ -640,6 +619,7 @@ void varpool_node_set_add (varpool_node_set, struct varpool_node *); void varpool_node_set_remove (varpool_node_set, struct varpool_node *); void dump_varpool_node_set (FILE *, varpool_node_set); void debug_varpool_node_set (varpool_node_set); +void free_varpool_node_set (varpool_node_set); void ipa_discover_readonly_nonaddressable_vars (void); bool cgraph_comdat_can_be_unshared_p (struct cgraph_node *); @@ -763,7 +743,7 @@ cgraph_node_in_set_p (struct cgraph_node *node, cgraph_node_set set) static inline size_t cgraph_node_set_size (cgraph_node_set set) { - return htab_elements (set->hashtab); + return VEC_length (cgraph_node_ptr, set->nodes); } /* Return true if iterator VSI points to nothing. */ @@ -811,7 +791,7 @@ varpool_node_in_set_p (struct varpool_node *node, varpool_node_set set) static inline size_t varpool_node_set_size (varpool_node_set set) { - return htab_elements (set->hashtab); + return VEC_length (varpool_node_ptr, set->nodes); } /* Uniquize all constants that appear in memory. diff --git a/gcc/ipa-utils.c b/gcc/ipa-utils.c index 6324d7ccc5c..de4f4b6e107 100644 --- a/gcc/ipa-utils.c +++ b/gcc/ipa-utils.c @@ -324,3 +324,260 @@ get_base_var (tree t) return t; } + +/* Create a new cgraph node set. */ + +cgraph_node_set +cgraph_node_set_new (void) +{ + cgraph_node_set new_node_set; + + new_node_set = XCNEW (struct cgraph_node_set_def); + new_node_set->map = pointer_map_create (); + new_node_set->nodes = NULL; + return new_node_set; +} + + +/* Add cgraph_node NODE to cgraph_node_set SET. */ + +void +cgraph_node_set_add (cgraph_node_set set, struct cgraph_node *node) +{ + void **slot; + + slot = pointer_map_insert (set->map, node); + + if (*slot) + { + int index = (size_t) *slot - 1; + gcc_checking_assert ((VEC_index (cgraph_node_ptr, set->nodes, index) + == node)); + return; + } + + *slot = (void *)(size_t) (VEC_length (cgraph_node_ptr, set->nodes) + 1); + + /* Insert into node vector. */ + VEC_safe_push (cgraph_node_ptr, heap, set->nodes, node); +} + + +/* Remove cgraph_node NODE from cgraph_node_set SET. */ + +void +cgraph_node_set_remove (cgraph_node_set set, struct cgraph_node *node) +{ + void **slot, **last_slot; + int index; + struct cgraph_node *last_node; + + slot = pointer_map_contains (set->map, node); + if (slot == NULL || !*slot) + return; + + index = (size_t) *slot - 1; + gcc_checking_assert (VEC_index (cgraph_node_ptr, set->nodes, index) + == node); + + /* Remove from vector. We do this by swapping node with the last element + of the vector. */ + last_node = VEC_pop (cgraph_node_ptr, set->nodes); + if (last_node != node) + { + last_slot = pointer_map_contains (set->map, last_node); + gcc_checking_assert (last_slot && *last_slot); + *last_slot = (void *)(size_t) (index + 1); + + /* Move the last element to the original spot of NODE. */ + VEC_replace (cgraph_node_ptr, set->nodes, index, last_node); + } + + /* Remove element from hash table. */ + *slot = NULL; +} + + +/* Find NODE in SET and return an iterator to it if found. A null iterator + is returned if NODE is not in SET. */ + +cgraph_node_set_iterator +cgraph_node_set_find (cgraph_node_set set, struct cgraph_node *node) +{ + void **slot; + cgraph_node_set_iterator csi; + + slot = pointer_map_contains (set->map, node); + if (slot == NULL || !*slot) + csi.index = (unsigned) ~0; + else + csi.index = (size_t)*slot - 1; + csi.set = set; + + return csi; +} + + +/* Dump content of SET to file F. */ + +void +dump_cgraph_node_set (FILE *f, cgraph_node_set set) +{ + cgraph_node_set_iterator iter; + + for (iter = csi_start (set); !csi_end_p (iter); csi_next (&iter)) + { + struct cgraph_node *node = csi_node (iter); + fprintf (f, " %s/%i", cgraph_node_name (node), node->uid); + } + fprintf (f, "\n"); +} + + +/* Dump content of SET to stderr. */ + +DEBUG_FUNCTION void +debug_cgraph_node_set (cgraph_node_set set) +{ + dump_cgraph_node_set (stderr, set); +} + + +/* Free varpool node set. */ + +void +free_cgraph_node_set (cgraph_node_set set) +{ + VEC_free (cgraph_node_ptr, heap, set->nodes); + pointer_map_destroy (set->map); + free (set); +} + + +/* Create a new varpool node set. */ + +varpool_node_set +varpool_node_set_new (void) +{ + varpool_node_set new_node_set; + + new_node_set = XCNEW (struct varpool_node_set_def); + new_node_set->map = pointer_map_create (); + new_node_set->nodes = NULL; + return new_node_set; +} + + +/* Add varpool_node NODE to varpool_node_set SET. */ + +void +varpool_node_set_add (varpool_node_set set, struct varpool_node *node) +{ + void **slot; + + slot = pointer_map_insert (set->map, node); + + if (*slot) + { + int index = (size_t) *slot - 1; + gcc_checking_assert ((VEC_index (varpool_node_ptr, set->nodes, index) + == node)); + return; + } + + *slot = (void *)(size_t) (VEC_length (varpool_node_ptr, set->nodes) + 1); + + /* Insert into node vector. */ + VEC_safe_push (varpool_node_ptr, heap, set->nodes, node); +} + + +/* Remove varpool_node NODE from varpool_node_set SET. */ + +void +varpool_node_set_remove (varpool_node_set set, struct varpool_node *node) +{ + void **slot, **last_slot; + int index; + struct varpool_node *last_node; + + slot = pointer_map_contains (set->map, node); + if (slot == NULL || !*slot) + return; + + index = (size_t) *slot - 1; + gcc_checking_assert (VEC_index (varpool_node_ptr, set->nodes, index) + == node); + + /* Remove from vector. We do this by swapping node with the last element + of the vector. */ + last_node = VEC_pop (varpool_node_ptr, set->nodes); + if (last_node != node) + { + last_slot = pointer_map_contains (set->map, last_node); + gcc_checking_assert (last_slot && *last_slot); + *last_slot = (void *)(size_t) (index + 1); + + /* Move the last element to the original spot of NODE. */ + VEC_replace (varpool_node_ptr, set->nodes, index, last_node); + } + + /* Remove element from hash table. */ + *slot = NULL; +} + + +/* Find NODE in SET and return an iterator to it if found. A null iterator + is returned if NODE is not in SET. */ + +varpool_node_set_iterator +varpool_node_set_find (varpool_node_set set, struct varpool_node *node) +{ + void **slot; + varpool_node_set_iterator vsi; + + slot = pointer_map_contains (set->map, node); + if (slot == NULL || !*slot) + vsi.index = (unsigned) ~0; + else + vsi.index = (size_t)*slot - 1; + vsi.set = set; + + return vsi; +} + + +/* Dump content of SET to file F. */ + +void +dump_varpool_node_set (FILE *f, varpool_node_set set) +{ + varpool_node_set_iterator iter; + + for (iter = vsi_start (set); !vsi_end_p (iter); vsi_next (&iter)) + { + struct varpool_node *node = vsi_node (iter); + fprintf (f, " %s", varpool_node_name (node)); + } + fprintf (f, "\n"); +} + + +/* Free varpool node set. */ + +void +free_varpool_node_set (varpool_node_set set) +{ + VEC_free (varpool_node_ptr, heap, set->nodes); + pointer_map_destroy (set->map); + free (set); +} + + +/* Dump content of SET to stderr. */ + +DEBUG_FUNCTION void +debug_varpool_node_set (varpool_node_set set) +{ + dump_varpool_node_set (stderr, set); +} diff --git a/gcc/ipa.c b/gcc/ipa.c index 606a9f374d1..8f1122b01f6 100644 --- a/gcc/ipa.c +++ b/gcc/ipa.c @@ -1047,320 +1047,6 @@ struct ipa_opt_pass_d pass_ipa_whole_program_visibility = NULL, /* variable_transform */ }; -/* Hash a cgraph node set element. */ - -static hashval_t -hash_cgraph_node_set_element (const void *p) -{ - const_cgraph_node_set_element element = (const_cgraph_node_set_element) p; - return htab_hash_pointer (element->node); -} - -/* Compare two cgraph node set elements. */ - -static int -eq_cgraph_node_set_element (const void *p1, const void *p2) -{ - const_cgraph_node_set_element e1 = (const_cgraph_node_set_element) p1; - const_cgraph_node_set_element e2 = (const_cgraph_node_set_element) p2; - - return e1->node == e2->node; -} - -/* Create a new cgraph node set. */ - -cgraph_node_set -cgraph_node_set_new (void) -{ - cgraph_node_set new_node_set; - - new_node_set = ggc_alloc_cgraph_node_set_def (); - new_node_set->hashtab = htab_create_ggc (10, - hash_cgraph_node_set_element, - eq_cgraph_node_set_element, - NULL); - new_node_set->nodes = NULL; - return new_node_set; -} - -/* Add cgraph_node NODE to cgraph_node_set SET. */ - -void -cgraph_node_set_add (cgraph_node_set set, struct cgraph_node *node) -{ - void **slot; - cgraph_node_set_element element; - struct cgraph_node_set_element_def dummy; - - dummy.node = node; - slot = htab_find_slot (set->hashtab, &dummy, INSERT); - - if (*slot != HTAB_EMPTY_ENTRY) - { - element = (cgraph_node_set_element) *slot; - gcc_assert (node == element->node - && (VEC_index (cgraph_node_ptr, set->nodes, element->index) - == node)); - return; - } - - /* Insert node into hash table. */ - element = ggc_alloc_cgraph_node_set_element_def (); - element->node = node; - element->index = VEC_length (cgraph_node_ptr, set->nodes); - *slot = element; - - /* Insert into node vector. */ - VEC_safe_push (cgraph_node_ptr, gc, set->nodes, node); -} - -/* Remove cgraph_node NODE from cgraph_node_set SET. */ - -void -cgraph_node_set_remove (cgraph_node_set set, struct cgraph_node *node) -{ - void **slot, **last_slot; - cgraph_node_set_element element, last_element; - struct cgraph_node *last_node; - struct cgraph_node_set_element_def dummy; - - dummy.node = node; - slot = htab_find_slot (set->hashtab, &dummy, NO_INSERT); - if (slot == NULL) - return; - - element = (cgraph_node_set_element) *slot; - gcc_assert (VEC_index (cgraph_node_ptr, set->nodes, element->index) - == node); - - /* Remove from vector. We do this by swapping node with the last element - of the vector. */ - last_node = VEC_pop (cgraph_node_ptr, set->nodes); - if (last_node != node) - { - dummy.node = last_node; - last_slot = htab_find_slot (set->hashtab, &dummy, NO_INSERT); - last_element = (cgraph_node_set_element) *last_slot; - gcc_assert (last_element); - - /* Move the last element to the original spot of NODE. */ - last_element->index = element->index; - VEC_replace (cgraph_node_ptr, set->nodes, last_element->index, - last_node); - } - - /* Remove element from hash table. */ - htab_clear_slot (set->hashtab, slot); - ggc_free (element); -} - -/* Find NODE in SET and return an iterator to it if found. A null iterator - is returned if NODE is not in SET. */ - -cgraph_node_set_iterator -cgraph_node_set_find (cgraph_node_set set, struct cgraph_node *node) -{ - void **slot; - struct cgraph_node_set_element_def dummy; - cgraph_node_set_element element; - cgraph_node_set_iterator csi; - - dummy.node = node; - slot = htab_find_slot (set->hashtab, &dummy, NO_INSERT); - if (slot == NULL) - csi.index = (unsigned) ~0; - else - { - element = (cgraph_node_set_element) *slot; - gcc_assert (VEC_index (cgraph_node_ptr, set->nodes, element->index) - == node); - csi.index = element->index; - } - csi.set = set; - - return csi; -} - -/* Dump content of SET to file F. */ - -void -dump_cgraph_node_set (FILE *f, cgraph_node_set set) -{ - cgraph_node_set_iterator iter; - - for (iter = csi_start (set); !csi_end_p (iter); csi_next (&iter)) - { - struct cgraph_node *node = csi_node (iter); - fprintf (f, " %s/%i", cgraph_node_name (node), node->uid); - } - fprintf (f, "\n"); -} - -/* Dump content of SET to stderr. */ - -DEBUG_FUNCTION void -debug_cgraph_node_set (cgraph_node_set set) -{ - dump_cgraph_node_set (stderr, set); -} - -/* Hash a varpool node set element. */ - -static hashval_t -hash_varpool_node_set_element (const void *p) -{ - const_varpool_node_set_element element = (const_varpool_node_set_element) p; - return htab_hash_pointer (element->node); -} - -/* Compare two varpool node set elements. */ - -static int -eq_varpool_node_set_element (const void *p1, const void *p2) -{ - const_varpool_node_set_element e1 = (const_varpool_node_set_element) p1; - const_varpool_node_set_element e2 = (const_varpool_node_set_element) p2; - - return e1->node == e2->node; -} - -/* Create a new varpool node set. */ - -varpool_node_set -varpool_node_set_new (void) -{ - varpool_node_set new_node_set; - - new_node_set = ggc_alloc_varpool_node_set_def (); - new_node_set->hashtab = htab_create_ggc (10, - hash_varpool_node_set_element, - eq_varpool_node_set_element, - NULL); - new_node_set->nodes = NULL; - return new_node_set; -} - -/* Add varpool_node NODE to varpool_node_set SET. */ - -void -varpool_node_set_add (varpool_node_set set, struct varpool_node *node) -{ - void **slot; - varpool_node_set_element element; - struct varpool_node_set_element_def dummy; - - dummy.node = node; - slot = htab_find_slot (set->hashtab, &dummy, INSERT); - - if (*slot != HTAB_EMPTY_ENTRY) - { - element = (varpool_node_set_element) *slot; - gcc_assert (node == element->node - && (VEC_index (varpool_node_ptr, set->nodes, element->index) - == node)); - return; - } - - /* Insert node into hash table. */ - element = ggc_alloc_varpool_node_set_element_def (); - element->node = node; - element->index = VEC_length (varpool_node_ptr, set->nodes); - *slot = element; - - /* Insert into node vector. */ - VEC_safe_push (varpool_node_ptr, gc, set->nodes, node); -} - -/* Remove varpool_node NODE from varpool_node_set SET. */ - -void -varpool_node_set_remove (varpool_node_set set, struct varpool_node *node) -{ - void **slot, **last_slot; - varpool_node_set_element element, last_element; - struct varpool_node *last_node; - struct varpool_node_set_element_def dummy; - - dummy.node = node; - slot = htab_find_slot (set->hashtab, &dummy, NO_INSERT); - if (slot == NULL) - return; - - element = (varpool_node_set_element) *slot; - gcc_assert (VEC_index (varpool_node_ptr, set->nodes, element->index) - == node); - - /* Remove from vector. We do this by swapping node with the last element - of the vector. */ - last_node = VEC_pop (varpool_node_ptr, set->nodes); - if (last_node != node) - { - dummy.node = last_node; - last_slot = htab_find_slot (set->hashtab, &dummy, NO_INSERT); - last_element = (varpool_node_set_element) *last_slot; - gcc_assert (last_element); - - /* Move the last element to the original spot of NODE. */ - last_element->index = element->index; - VEC_replace (varpool_node_ptr, set->nodes, last_element->index, - last_node); - } - - /* Remove element from hash table. */ - htab_clear_slot (set->hashtab, slot); - ggc_free (element); -} - -/* Find NODE in SET and return an iterator to it if found. A null iterator - is returned if NODE is not in SET. */ - -varpool_node_set_iterator -varpool_node_set_find (varpool_node_set set, struct varpool_node *node) -{ - void **slot; - struct varpool_node_set_element_def dummy; - varpool_node_set_element element; - varpool_node_set_iterator vsi; - - dummy.node = node; - slot = htab_find_slot (set->hashtab, &dummy, NO_INSERT); - if (slot == NULL) - vsi.index = (unsigned) ~0; - else - { - element = (varpool_node_set_element) *slot; - gcc_assert (VEC_index (varpool_node_ptr, set->nodes, element->index) - == node); - vsi.index = element->index; - } - vsi.set = set; - - return vsi; -} - -/* Dump content of SET to file F. */ - -void -dump_varpool_node_set (FILE *f, varpool_node_set set) -{ - varpool_node_set_iterator iter; - - for (iter = vsi_start (set); !vsi_end_p (iter); vsi_next (&iter)) - { - struct varpool_node *node = vsi_node (iter); - fprintf (f, " %s", varpool_node_name (node)); - } - fprintf (f, "\n"); -} - -/* Dump content of SET to stderr. */ - -DEBUG_FUNCTION void -debug_varpool_node_set (varpool_node_set set) -{ - dump_varpool_node_set (stderr, set); -} - /* Simple ipa profile pass propagating frequencies across the callgraph. */ diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index efcd6335919..dea5f648080 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,11 @@ +2011-05-03 Jan Hubicka <jh@suse.cz> + + * lto.c (ltrans_partition_def): Remove GTY annotations. + (ltrans_partitions): Move to heap. + (new_partition): Update. + (free_ltrans_partitions): New function. + (lto_wpa_write_files): Use it. + 2011-04-29 Martin Jambor <mjambor@suse.cz> * lto.c: Include ipa-utils.h. diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c index a8027a4aed5..9407a172395 100644 --- a/gcc/lto/lto.c +++ b/gcc/lto/lto.c @@ -1127,19 +1127,19 @@ free_section_data (struct lto_file_decl_data *file_data ATTRIBUTE_UNUSED, /* Structure describing ltrans partitions. */ -struct GTY (()) ltrans_partition_def +struct ltrans_partition_def { cgraph_node_set cgraph_set; varpool_node_set varpool_set; - const char * GTY ((skip)) name; + const char * name; int insns; }; typedef struct ltrans_partition_def *ltrans_partition; DEF_VEC_P(ltrans_partition); -DEF_VEC_ALLOC_P(ltrans_partition,gc); +DEF_VEC_ALLOC_P(ltrans_partition,heap); -static GTY (()) VEC(ltrans_partition, gc) *ltrans_partitions; +static VEC(ltrans_partition, heap) *ltrans_partitions; static void add_cgraph_node_to_partition (ltrans_partition part, struct cgraph_node *node); static void add_varpool_node_to_partition (ltrans_partition part, struct varpool_node *vnode); @@ -1148,15 +1148,29 @@ static void add_varpool_node_to_partition (ltrans_partition part, struct varpool static ltrans_partition new_partition (const char *name) { - ltrans_partition part = ggc_alloc_ltrans_partition_def (); + ltrans_partition part = XCNEW (struct ltrans_partition_def); part->cgraph_set = cgraph_node_set_new (); part->varpool_set = varpool_node_set_new (); part->name = name; part->insns = 0; - VEC_safe_push (ltrans_partition, gc, ltrans_partitions, part); + VEC_safe_push (ltrans_partition, heap, ltrans_partitions, part); return part; } +/* Free memory used by ltrans datastructures. */ +static void +free_ltrans_partitions () +{ + unsigned int idx; + ltrans_partition part; + for (idx = 0; VEC_iterate (ltrans_partition, ltrans_partitions, idx, part); idx++) + { + free_cgraph_node_set (part->cgraph-set); + free (part); + } + VEC_free (latrans_partition, heap, ltrans_partitions); +} + /* See all references that go to comdat objects and bring them into partition too. */ static void add_references_to_partition (ltrans_partition part, struct ipa_ref_list *refs) @@ -1977,6 +1991,8 @@ lto_wpa_write_files (void) if (fclose (ltrans_output_list_stream)) fatal_error ("closing LTRANS output list %s: %m", ltrans_output_list); + free_ltrans_partitions(); + timevar_pop (TV_WHOPR_WPA_IO); } diff --git a/gcc/passes.c b/gcc/passes.c index da19ea8689d..38b38cd7cba 100644 --- a/gcc/passes.c +++ b/gcc/passes.c @@ -1729,8 +1729,8 @@ ipa_write_summaries (void) ipa_write_summaries_1 (set, vset); free (order); - ggc_free (set); - ggc_free (vset); + free_cgraph_node_set (set); + free_varpool_node_set (vset); } /* Same as execute_pass_list but assume that subpasses of IPA passes diff --git a/gcc/tree-emutls.c b/gcc/tree-emutls.c index 19f627e16d0..11240477b97 100644 --- a/gcc/tree-emutls.c +++ b/gcc/tree-emutls.c @@ -781,7 +781,7 @@ ipa_lower_emutls (void) VEC_free (varpool_node_ptr, heap, control_vars); VEC_free (tree, heap, access_vars); - tls_vars = NULL; + free_varpool_node_set (tls_vars); return TODO_dump_func | TODO_ggc_collect | TODO_verify_all; } |