From 48f8fefe5bc5f1fe1e0bddbf3188d59d91ab60be Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Mon, 10 Jun 2019 09:04:39 +0200 Subject: [PATCH] Fix build with --enable-gather-detailed-mem-stats. 2019-06-10 Martin Liska * hash-map.h: Pass default value to hash_table ctor. * hash-table.h: Add default value to call of a ctor. From-SVN: r272104 --- gcc/ChangeLog | 5 +++++ gcc/hash-map.h | 6 ++++-- gcc/hash-table.h | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5a6d6f6e8f5..9fc63c540ec 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2019-06-10 Martin Liska + + * hash-map.h: Pass default value to hash_table ctor. + * hash-table.h: Add default value to call of a ctor. + 2019-06-08 Jonathan Wakely * doc/invoke.texi (C Dialect Options): Minor grammatical change. diff --git a/gcc/hash-map.h b/gcc/hash-map.h index a3ef283a1f9..a8eb42d5a03 100644 --- a/gcc/hash-map.h +++ b/gcc/hash-map.h @@ -120,12 +120,14 @@ public: explicit hash_map (size_t n = 13, bool ggc = false, bool gather_mem_stats = GATHER_STATISTICS CXX_MEM_STAT_INFO) - : m_table (n, ggc, gather_mem_stats, HASH_MAP_ORIGIN PASS_MEM_STAT) {} + : m_table (n, ggc, true, gather_mem_stats, HASH_MAP_ORIGIN PASS_MEM_STAT) + { + } explicit hash_map (const hash_map &h, bool ggc = false, bool gather_mem_stats = GATHER_STATISTICS CXX_MEM_STAT_INFO) - : m_table (h.m_table, ggc, gather_mem_stats, + : m_table (h.m_table, ggc, true, gather_mem_stats, HASH_MAP_ORIGIN PASS_MEM_STAT) {} /* Create a hash_map in ggc memory. */ diff --git a/gcc/hash-table.h b/gcc/hash-table.h index 686a13dbd4b..6c1fca3459b 100644 --- a/gcc/hash-table.h +++ b/gcc/hash-table.h @@ -389,7 +389,7 @@ public: create_ggc (size_t n CXX_MEM_STAT_INFO) { hash_table *table = ggc_alloc (); - new (table) hash_table (n, true, GATHER_STATISTICS, + new (table) hash_table (n, true, true, GATHER_STATISTICS, HASH_TABLE_ORIGIN PASS_MEM_STAT); return table; } -- 2.30.2