OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

decl.c (start_decl): Simplify specialization handling. 

* decl.c (start_decl): Simplify specialization handling. Remove
	unneeded CLASSTYPE_TEMPLATE_INSTANTIATION check.
	* mangle.c (discriminator_for_local_entity): Use VEC_index.

From-SVN: r100488
This commit is contained in:
Nathan Sidwell 2005-06-02 09:34:38 +00:00 committed by Nathan Sidwell
parent 58fb06b4a1
commit 9267ee62db
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,5 +1,9 @@
2005-06-02 Nathan Sidwell <nathan@codesourcery.com>
* decl.c (start_decl): Simplify specialization handling. Remove
unneeded CLASSTYPE_TEMPLATE_INSTANTIATION check.
* mangle.c (discriminator_for_local_entity): Use VEC_index.
PR c++/20350
* decl.c (duplicate_decls): Copy all of DECL_USE_TEMPLATE.

20
gcc/cp/decl.c
View File

@ -3716,22 +3716,22 @@ start_decl (const cp_declarator *declarator,
/* cp_finish_decl sets DECL_EXTERNAL if DECL_IN_AGGR_P is set. */
DECL_IN_AGGR_P (decl) = 0;
if ((DECL_LANG_SPECIFIC (decl) && DECL_USE_TEMPLATE (decl))
|| CLASSTYPE_TEMPLATE_INSTANTIATION (context))
/* Do not mark DECL as an explicit specialization if it was not
already marked as an instantiation; a declaration should
never be marked as a specialization unless we know what
template is being specialized. */
if (DECL_LANG_SPECIFIC (decl) && DECL_USE_TEMPLATE (decl))
{
/* Do not mark DECL as an explicit specialization if it was
not already marked as an instantiation; a declaration
should never be marked as a specialization unless we know
what template is being specialized. */
if (DECL_LANG_SPECIFIC (decl) && DECL_USE_TEMPLATE (decl))
SET_DECL_TEMPLATE_SPECIALIZATION (decl);
SET_DECL_TEMPLATE_SPECIALIZATION (decl);
/* [temp.expl.spec] An explicit specialization of a static data
member of a template is a definition if the declaration
includes an initializer; otherwise, it is a declaration.
We check for processing_specialization so this only applies
to the new specialization syntax. */
if (DECL_INITIAL (decl) == NULL_TREE && processing_specialization)
if (!DECL_INITIAL (decl)
&& processing_specialization)
DECL_EXTERNAL (decl) = 1;
}

17
gcc/cp/mangle.c
View File

@ -1426,8 +1426,6 @@ write_special_name_destructor (const tree dtor)
static int
discriminator_for_local_entity (tree entity)
{
tree *type;
/* Assume this is the only local entity with this name. */
int discriminator = 0;
@ -1435,12 +1433,19 @@ discriminator_for_local_entity (tree entity)
discriminator = DECL_DISCRIMINATOR (entity);
else if (TREE_CODE (entity) == TYPE_DECL)
{
int ix;
/* Scan the list of local classes. */
entity = TREE_TYPE (entity);
for (type = VEC_address (tree, local_classes); *type != entity; ++type)
if (TYPE_IDENTIFIER (*type) == TYPE_IDENTIFIER (entity)
&& TYPE_CONTEXT (*type) == TYPE_CONTEXT (entity))
++discriminator;
for (ix = 0; ; ix++)
{
tree type = VEC_index (tree, local_classes, ix);
if (type == entity)
break;
if (TYPE_IDENTIFIER (type) == TYPE_IDENTIFIER (entity)
&& TYPE_CONTEXT (type) == TYPE_CONTEXT (entity))
++discriminator;
}
}
return discriminator;