Skip to content

R
riscv-gcc-1
Commit 714f2304 by Douglas Gregor Committed by Doug Gregor
Options

re PR c++/33112 (ICE : canonical types differ for identical types const _CharT*… 

re PR c++/33112 (ICE : canonical types differ for identical types const _CharT* [14] and const _CharT* [14])

2007-09-24  Douglas Gregor  <doug.gregor@gmail.com>

	PR c++/33112
	PR c++/33185	
	* tree.c (cplus_array_compare): Compare pointers, not types.
	(build_cplus_array_type_1): Store new array type into the hash
	table before building the canonical type; build the canonical type
	correctly.
	(cp_build_qualified_type_real): Put all of the array types with
	cv-qualified element types into the C++ array hash table, built as 
	variants of the unqualified versions.

From-SVN: r128711
parent 996caac6
Showing with 47 additions and 56 deletions
gcc/cp/ChangeLog
2007-09-24 Douglas Gregor <doug.gregor@gmail.com>
PR c++/33112
PR c++/33185
* tree.c (cplus_array_compare): Compare pointers, not types.
(build_cplus_array_type_1): Store new array type into the hash
table before building the canonical type; build the canonical type
correctly.
(cp_build_qualified_type_real): Put all of the array types with
cv-qualified element types into the C++ array hash table, built as
variants of the unqualified versions.
2007-09-23 Jason Merrill <jason@redhat.com>
PR c++/16370
......
gcc/cp/tree.c
......@@ -512,18 +512,12 @@ cplus_array_compare (const void * k1, const void * k2)
const_tree const t1 = (const_tree) k1;
const cplus_array_info *const t2 = (const cplus_array_info*) k2;
if (!comptypes (TREE_TYPE (t1), t2->type, COMPARE_STRUCTURAL))
return 0;
if (!TYPE_DOMAIN (t1))
return !t2->domain;
if (!t2->domain)
return 0;
return comptypes (TYPE_DOMAIN (t1), t2->domain, COMPARE_STRUCTURAL);
return (TREE_TYPE (t1) == t2->type && TYPE_DOMAIN (t1) == t2->domain);
}
/* Hash table containing all of the C++ array types, including
dependent array types and array types whose element type is
cv-qualified. */
static GTY ((param_is (union tree_node))) htab_t cplus_array_htab;
......@@ -563,7 +557,10 @@ build_cplus_array_type_1 (tree elt_type, tree index_type)
TREE_TYPE (t) = elt_type;
TYPE_DOMAIN (t) = index_type;
/* Complete building the array type. */
/* Store it in the hash table. */
*e = t;
/* Set the canonical type for this new node. */
if (TYPE_STRUCTURAL_EQUALITY_P (elt_type)
|| (index_type && TYPE_STRUCTURAL_EQUALITY_P (index_type)))
SET_TYPE_STRUCTURAL_EQUALITY (t);
......@@ -571,14 +568,11 @@ build_cplus_array_type_1 (tree elt_type, tree index_type)
|| (index_type
&& TYPE_CANONICAL (index_type) != index_type))
TYPE_CANONICAL (t)
= TYPE_CANONICAL
(build_cplus_array_type_1 (TYPE_CANONICAL (elt_type),
index_type?
TYPE_CANONICAL (index_type)
: index_type));
/* Store it in the hash table. */
*e = t;
= build_cplus_array_type
(TYPE_CANONICAL (elt_type),
index_type? TYPE_CANONICAL (index_type) : index_type);
else
TYPE_CANONICAL (t) = t;
}
}
else
......@@ -713,27 +707,7 @@ cp_build_qualified_type_real (tree type,
if (!t)
{
tree domain = TYPE_DOMAIN (type);
/* Make a new array type, just like the old one, but with the
appropriately qualified element type. */
t = build_variant_type_copy (type);
TREE_TYPE (t) = element_type;
/* This is a new type. */
TYPE_CANONICAL (t) = t;
if (dependent_type_p (element_type)
|| (domain
&& value_dependent_expression_p (TYPE_MAX_VALUE (domain))))
{
/* The new dependent array type we just created might be
equivalent to an existing dependent array type, so we
need to keep track of this new array type with a
lookup into CPLUS_ARRAY_HTAB. Note that we cannot
directly call build_cplus_array_type (that would
recurse) or build_cplus_array_type_1 (that would lose
attributes). */
tree index_type = TYPE_DOMAIN (type);
void **e;
cplus_array_info cai;
hashval_t hash;
......@@ -744,28 +718,33 @@ cp_build_qualified_type_real (tree type,
NULL);
hash = (htab_hash_pointer (element_type)
^ htab_hash_pointer (domain));
^ htab_hash_pointer (index_type));
cai.type = element_type;
cai.domain = domain;
cai.domain = index_type;
e = htab_find_slot_with_hash (cplus_array_htab, &cai, hash,
INSERT);
if (! *e)
/* Save this new type. */
e = htab_find_slot_with_hash (cplus_array_htab, &cai, hash, INSERT);
if (*e)
/* We have found the type: we're done. */
return (tree) *e;
/* Build a new array type and add it into the table. */
t = build_variant_type_copy (type);
TREE_TYPE (t) = element_type;
*e = t;
}
if (TYPE_STRUCTURAL_EQUALITY_P (TREE_TYPE (t))
|| (TYPE_DOMAIN (t)
&& TYPE_STRUCTURAL_EQUALITY_P (TYPE_DOMAIN (t))))
/* Set the canonical type for this new node. */
if (TYPE_STRUCTURAL_EQUALITY_P (element_type)
|| (index_type && TYPE_STRUCTURAL_EQUALITY_P (index_type)))
SET_TYPE_STRUCTURAL_EQUALITY (t);
else
else if (TYPE_CANONICAL (element_type) != element_type
|| (index_type
&& TYPE_CANONICAL (index_type) != index_type))
TYPE_CANONICAL (t)
= TYPE_CANONICAL
(build_array_type (TYPE_CANONICAL (TREE_TYPE (t)),
TYPE_DOMAIN (t)?
TYPE_CANONICAL (TYPE_DOMAIN(t))
: TYPE_DOMAIN (t)));
= build_cplus_array_type
(TYPE_CANONICAL (element_type),
index_type? TYPE_CANONICAL (index_type) : index_type);
else
TYPE_CANONICAL (t) = t;
}
/* Even if we already had this variant, we update
......
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