Commit fa583f9e by Jason Merrill Committed by Jason Merrill

re PR c++/68309 (ICE: Segmentation fault)

	PR c++/68309
gcc/
	* hash-table.h: Add copy constructor.
	* hash-map.h: Add copy constructor.
gcc/cp/
	* pt.c (instantiate_decl): Copy local_specializations for nested
	function.

From-SVN: r231632
parent 1cb62d16
2015-12-14 Jason Merrill <jason@redhat.com>
PR c++/68309
* hash-table.h: Add copy constructor.
* hash-map.h: Add copy constructor.
2015-12-14 Tom de Vries <tom@codesourcery.com>
PR other/68882
2015-12-14 Jason Merrill <jason@redhat.com>
PR c++/68309
* pt.c (instantiate_decl): Copy local_specializations for nested
function.
2015-12-09 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/60218
......
......@@ -21725,8 +21725,13 @@ instantiate_decl (tree d, int defer_ok,
template from within the body of another. */
saved_local_specializations = local_specializations;
/* Set up the list of local specializations. */
local_specializations = new hash_map<tree, tree>;
/* Set up the list of local specializations, copying the current
list if there is one. */
if (local_specializations)
local_specializations
= new hash_map<tree, tree> (*local_specializations);
else
local_specializations = new hash_map<tree, tree>;
/* Set up context. */
if (DECL_OMP_DECLARE_REDUCTION_P (code_pattern)
......
......@@ -111,6 +111,11 @@ public:
CXX_MEM_STAT_INFO)
: m_table (n, ggc, gather_mem_stats, HASH_MAP_ORIGIN PASS_MEM_STAT) {}
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,
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 = GATHER_STATISTICS
......
......@@ -365,6 +365,10 @@ public:
bool gather_mem_stats = GATHER_STATISTICS,
mem_alloc_origin origin = HASH_TABLE_ORIGIN
CXX_MEM_STAT_INFO);
hash_table (const hash_table &, bool ggc = false,
bool gather_mem_stats = GATHER_STATISTICS,
mem_alloc_origin origin = HASH_TABLE_ORIGIN
CXX_MEM_STAT_INFO);
~hash_table ();
/* Create a hash_table in gc memory. */
......@@ -582,6 +586,35 @@ hash_table<Descriptor, Allocator>::hash_table (size_t size, bool ggc, bool
}
template<typename Descriptor, template<typename Type> class Allocator>
hash_table<Descriptor, Allocator>::hash_table (const hash_table &h, bool ggc,
bool gather_mem_stats,
mem_alloc_origin origin
MEM_STAT_DECL) :
m_n_elements (h.m_n_elements), m_n_deleted (h.m_n_deleted),
m_searches (0), m_collisions (0), m_ggc (ggc),
m_gather_mem_stats (gather_mem_stats)
{
size_t size = h.m_size;
if (m_gather_mem_stats)
hash_table_usage.register_descriptor (this, origin, ggc
FINAL_PASS_MEM_STAT);
value_type *nentries = alloc_entries (size PASS_MEM_STAT);
for (size_t i = 0; i < size; ++i)
{
value_type &entry = h.m_entries[i];
if (is_deleted (entry))
mark_deleted (nentries[i]);
else if (!is_empty (entry))
nentries[i] = entry;
}
m_entries = nentries;
m_size = size;
m_size_prime_index = h.m_size_prime_index;
}
template<typename Descriptor, template<typename Type> class Allocator>
hash_table<Descriptor, Allocator>::~hash_table ()
{
for (size_t i = m_size - 1; i < m_size; i--)
......
// PR c++/68309
// { dg-do compile { target c++11 } }
template <class... Ts> void f(Ts...);
template <class T> T g(T);
template <typename... Ts> void print(Ts... args) {
[&] { f(g<decltype(args)>(args)...); }();
}
int main() { print(5.2); }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment