diff options
| author | Marek Polacek <polacek@redhat.com> | 2015-04-30 17:25:55 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2015-04-30 17:25:55 +0000 |
| commit | 1c3289cd615ce4a38c4a54d69ebfa5ebc47685ca (patch) | |
| tree | b6f4b29edee73742a200cbeb726bd7edb49f9e15 | |
| parent | 66286a53d5f325b1b396d0d590dfa1c6aa51cbca (diff) | |
| download | gcc-1c3289cd615ce4a38c4a54d69ebfa5ebc47685ca.zip gcc-1c3289cd615ce4a38c4a54d69ebfa5ebc47685ca.tar.gz gcc-1c3289cd615ce4a38c4a54d69ebfa5ebc47685ca.tar.bz2 | |
* varasm.c (handle_cache_entry): Fix logic.
From-SVN: r222641
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/varasm.c | 21 |
2 files changed, 14 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d24460f..9f5cab0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2015-04-30 Marek Polacek <polacek@redhat.com> + + * varasm.c (handle_cache_entry): Fix logic. + 2015-04-30 Kyrylo Tkachov <kyrylo.tkachov@arm.com> * config/aarch64/aarch64.md (*extr<mode>5_insn_alt): New pattern. diff --git a/gcc/varasm.c b/gcc/varasm.c index 9131e83..c2b35fd 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -5793,21 +5793,20 @@ struct tm_clone_hasher : ggc_cache_hasher<tree_map *> static hashval_t hash (tree_map *m) { return tree_map_hash (m); } static bool equal (tree_map *a, tree_map *b) { return tree_map_eq (a, b); } - static void handle_cache_entry (tree_map *&e) + static void + handle_cache_entry (tree_map *&e) { - if (e != HTAB_EMPTY_ENTRY || e != HTAB_DELETED_ENTRY) - { - extern void gt_ggc_mx (tree_map *&); - if (ggc_marked_p (e->base.from)) - gt_ggc_mx (e); - else - e = static_cast<tree_map *> (HTAB_DELETED_ENTRY); - } + extern void gt_ggc_mx (tree_map *&); + if (e == HTAB_EMPTY_ENTRY || e == HTAB_DELETED_ENTRY) + return; + else if (ggc_marked_p (e->base.from)) + gt_ggc_mx (e); + else + e = static_cast<tree_map *> (HTAB_DELETED_ENTRY); } }; -static GTY((cache)) - hash_table<tm_clone_hasher> *tm_clone_hash; +static GTY((cache)) hash_table<tm_clone_hasher> *tm_clone_hash; void record_tm_clone_pair (tree o, tree n) |