From e3343fd618c0b71350d0512b7225f58d427c59b5 Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 11 Dec 2015 11:29:02 +0000 Subject: [PATCH] * hash-map.h (hash_map::hash_map): Gather statistics only when GATHER_STATISTICS is true. * hash-set.h (hash_set::hash_set): Ditto. * hash-table.h (hash_table::hash_table): Ditto. (hash_table::create_ggc): Ditto. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231560 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 9 +++++++++ gcc/hash-map.h | 6 ++++-- gcc/hash-set.h | 2 +- gcc/hash-table.h | 6 ++++-- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6df230bed9e8..927db65ee921 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2015-12-11 Michael Matz + + * hash-map.h (hash_map::hash_map): Gather statistics only + when GATHER_STATISTICS is true. + * hash-set.h (hash_set::hash_set): Ditto. + * hash-table.h (hash_table::hash_table): Ditto. + (hash_table::create_ggc): Ditto. + 2015-12-11 Martin Jambor PR ipa/68064 @@ -3242,6 +3250,7 @@ 2015-11-19 Michael Matz + PR rtl-optimization/68392 * fwprop.c (update_uses): Use flag_checking instead of gcc_checking_assert. diff --git a/gcc/hash-map.h b/gcc/hash-map.h index b83708c54a4b..81ede08e7c7c 100644 --- a/gcc/hash-map.h +++ b/gcc/hash-map.h @@ -107,11 +107,13 @@ class GTY((user)) hash_map public: explicit hash_map (size_t n = 13, bool ggc = false, - bool gather_mem_stats = true CXX_MEM_STAT_INFO) + bool gather_mem_stats = GATHER_STATISTICS + CXX_MEM_STAT_INFO) : m_table (n, ggc, gather_mem_stats, HASH_MAP_ORIGIN PASS_MEM_STAT) {} /* Create a hash_map in ggc memory. */ - static hash_map *create_ggc (size_t size, bool gather_mem_stats = true + static hash_map *create_ggc (size_t size, + bool gather_mem_stats = GATHER_STATISTICS CXX_MEM_STAT_INFO) { hash_map *map = ggc_alloc (); diff --git a/gcc/hash-set.h b/gcc/hash-set.h index 8a7c9a00c178..602f9e7e15e0 100644 --- a/gcc/hash-set.h +++ b/gcc/hash-set.h @@ -27,7 +27,7 @@ class hash_set public: typedef typename Traits::value_type Key; explicit hash_set (size_t n = 13, bool ggc = false CXX_MEM_STAT_INFO) - : m_table (n, ggc, true, HASH_SET_ORIGIN PASS_MEM_STAT) {} + : m_table (n, ggc, GATHER_STATISTICS, HASH_SET_ORIGIN PASS_MEM_STAT) {} /* Create a hash_set in gc memory with space for at least n elements. */ diff --git a/gcc/hash-table.h b/gcc/hash-table.h index 192be3036373..85598301e9b9 100644 --- a/gcc/hash-table.h +++ b/gcc/hash-table.h @@ -361,7 +361,8 @@ class hash_table typedef typename Descriptor::compare_type compare_type; public: - explicit hash_table (size_t, bool ggc = false, bool gather_mem_stats = true, + explicit hash_table (size_t, bool ggc = false, + bool gather_mem_stats = GATHER_STATISTICS, mem_alloc_origin origin = HASH_TABLE_ORIGIN CXX_MEM_STAT_INFO); ~hash_table (); @@ -371,7 +372,8 @@ public: create_ggc (size_t n CXX_MEM_STAT_INFO) { hash_table *table = ggc_alloc (); - new (table) hash_table (n, true, true, HASH_TABLE_ORIGIN PASS_MEM_STAT); + new (table) hash_table (n, true, GATHER_STATISTICS, + HASH_TABLE_ORIGIN PASS_MEM_STAT); return table; } -- 2.47.2