procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR c++/35113 (g++.dg/ext/vector13.C doesn't work)

Browse source 
2008-02-11  Douglas Gregor  <doug.gregor@gmail.com>

       PR c++/35113
       * tree.c (cp_build_qualified_type_real): When building a
       cv-qualified array type, build it as a unique type with
       build_cplus_array_type_1 and then adopt the unqualified type's
       main variant.

From-SVN: r132242
This commit is contained in:
Douglas Gregor 2008-02-11 18:58:16 +00:00 • committed by Doug Gregor
parent 5fd38b882f
commit 37d24376c4
2 changed files with 32 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/cp/ChangeLog
View file

@ -1,3 +1,11 @@
2008-02-11 Douglas Gregor <doug.gregor@gmail.com>
PR c++/35113
* tree.c (cp_build_qualified_type_real): When building a
cv-qualified array type, build it as a unique type with
build_cplus_array_type_1 and then adopt the unqualified type's
main variant.
2008-02-11 Paolo Carlini <pcarlini@suse.de>
PR c++/35077

62
gcc/cp/tree.c
View file

@ -726,47 +726,33 @@ cp_build_qualified_type_real (tree type,
break;
if (!t)
{
tree index_type = TYPE_DOMAIN (type);
void **e;
cplus_array_info cai;
hashval_t hash;
{
t = build_cplus_array_type_1 (element_type, TYPE_DOMAIN (type));
if (cplus_array_htab == NULL)
cplus_array_htab = htab_create_ggc (61, &cplus_array_hash,
&cplus_array_compare,
NULL);
if (TYPE_MAIN_VARIANT (t) != TYPE_MAIN_VARIANT (type))
{
/* Set the main variant of the newly-created ARRAY_TYPE
(with cv-qualified element type) to the main variant of
the unqualified ARRAY_TYPE we started with. */
tree last_variant = t;
tree m = TYPE_MAIN_VARIANT (type);
hash = (htab_hash_pointer (element_type)
^ htab_hash_pointer (index_type));
cai.type = element_type;
cai.domain = index_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;
/* Find the last variant on the new ARRAY_TYPEs list of
variants, setting the main variant of each of the other
types to the main variant of our unqualified
ARRAY_TYPE. */
while (TYPE_NEXT_VARIANT (last_variant))
{
TYPE_MAIN_VARIANT (last_variant) = m;
last_variant = TYPE_NEXT_VARIANT (last_variant);
}
/* Build a new array type and add it into the table. */
t = build_variant_type_copy (type);
TREE_TYPE (t) = element_type;
*e = 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 if (TYPE_CANONICAL (element_type) != element_type
|| (index_type
&& TYPE_CANONICAL (index_type) != index_type)
|| TYPE_CANONICAL (type) != type)
TYPE_CANONICAL (t)
= build_cplus_array_type
(TYPE_CANONICAL (element_type),
index_type? TYPE_CANONICAL (index_type) : index_type);
else
TYPE_CANONICAL (t) = t;
}
/* Splice in the newly-created variants. */
TYPE_NEXT_VARIANT (last_variant) = TYPE_NEXT_VARIANT (m);
TYPE_NEXT_VARIANT (m) = t;
TYPE_MAIN_VARIANT (last_variant) = m;
}
}
/* Even if we already had this variant, we update
TYPE_NEEDS_CONSTRUCTING and TYPE_HAS_NONTRIVIAL_DESTRUCTOR in case