[Bug c++/45606] [4.5/4.6 Regression] match a method prototyped a typedef alias with the original type (using stdlib)

[Bug c++/45606] [4.5/4.6 Regression] match a method prototyped a typedef alias with the original type (using stdlib)

[dodji at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=45606

--- Comment #5 from Dodji Seketeli <dodji at gcc dot gnu.org> 2010-11-02 12:44:23 UTC ---
Author: dodji
Date: Tue Nov  2 12:44:19 2010
New Revision: 166179

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=166179
Log:
Restore canonical type comparison for dependent type(def)s

This patch restores canonical type comparison for dependent types and
then dependent typedefs. After this patch, two template type
parameters T are equal if they have the same index, level, *and*
number of sibling parameters. The novelty is to take in account the
number of sibling parameters.

To do this we first build the template parameters w/o taking in
account their number of siblings. When we know the number of template
parameters we fix up each template parameter with the number of
slibling parameters and we build the appropriate canonical types
accordingly. The patch fixes the fallouts deemed necessary.

This fixes PR c++/45606 but actually fixes all the previous bugs
related to dependent typedef comparison we had since we started to
properly representing dependent typedefs.

gcc/cp/ChangeLog:
    PR c++/45606
    * cp-tree.h (TEMPLATE_TYPE_PARM_SIBLING_PARMS): Remove.
    (struct template_parm_index_s)<num_siblings>: New field.
    (TEMPLATE_PARM_NUM_SIBLINGS): New accessor.
    (process_template_parm): Extend the API to accept the number of
    template parms in argument.
    (cp_set_underlying_type): Remove this.
    * class.c (build_self_reference): Require canonical type equality
    back on the self reference of class.
    * decl2.c (grokfield): Require canonical type equality back on
    typedef class fields.
    * name-lookup.c (pushdecl_maybe_friend): Require canonical type
    equality back on typedefs.
    * parser.c (cp_parser_template_parameter_list): Do not require
    canonical type equality on dependent types created during
    template parameters parsing.
    * pt.c (fixup_template_type_parm_type, fixup_template_parm_index)
    (fixup_template_parm, fixup_template_parms): New private
    functions.
    (current_template_args): Declare this.
    (process_template_parm): Pass the total number of template parms
    to canonical_type_parameter.
    (build_template_parm_index): Add a new argument to carry the total
    number of template parms.
    (reduce_template_parm_level, process_template_parm, make_auto): Adjust.
    (current_template_args): Fix this for template template
    parameters.
    (tsubst_template_parm): Split out of ...
    (tsubst_template_parms): ... this.
    (reduce_template_parm_level): Don't loose
    TEMPLATE_PARM_NUM_SIBLINGS when cloning a TEMPLATE_PARM_INDEX.
    (template_parm_to_arg): Extracted this function from
    current_template_args. Make it represent invalid template parms
    with an error_mark_node instead of a LIST_TREE containing an
    error_mark_node.
    (current_template_args): Use template_parm_to_arg.
    (dependent_template_arg_p): Consider an invalid template argument
    as dependent.
    (end_template_parm_list): Do not update template sibling parms
    here anymore. Use fixup_template_parms instead.
    (process_template_parm): Pass the number of template parms to
    canonical_type_parameter.
    (make_auto): Require structural equality on auto
    TEMPLATE_TYPE_PARM for now.
    (unify)<BOUND_TEMPLATE_TEMPLATE_PARM>: Coerce template parameters
    using all the arguments deduced so far.
    (tsubst)<TEMPLATE_TYPE_PARM>: Pass the number of sibling parms to
    canonical_type_parameter.
    * tree.c (cp_set_underlying_type): Remove.
    * typeck.c (get_template_parms_of_dependent_type)
    (incompatible_dependent_types_p): Remove.
    (structural_comptypes): Do not call incompatible_dependent_types_p
    anymore.
    (comp_template_parms_position): Re-organized. Take the length of
    template parms list in account.

gcc/testsuite/ChangeLog:
    PR c++/45606
    * g++.dg/template/typedef36.C: New test.
    * gcc/testsuite/g++.dg/template/canon-type-9.C: Likewise.
    * g++.dg/template/canon-type-10.C: Likewise.
    * g++.dg/template/canon-type-11.C: Likewise.
    * g++.dg/template/canon-type-12.C: Likewise.
    * g++.dg/template/canon-type-13.C: Likewise.

Added:
    trunk/gcc/testsuite/g++.dg/template/canon-type-10.C
    trunk/gcc/testsuite/g++.dg/template/canon-type-11.C
    trunk/gcc/testsuite/g++.dg/template/canon-type-12.C
    trunk/gcc/testsuite/g++.dg/template/canon-type-13.C
    trunk/gcc/testsuite/g++.dg/template/canon-type-9.C
    trunk/gcc/testsuite/g++.dg/template/typedef36.C
Modified:
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/class.c
    trunk/gcc/cp/cp-tree.h
    trunk/gcc/cp/decl2.c
    trunk/gcc/cp/name-lookup.c
    trunk/gcc/cp/parser.c
    trunk/gcc/cp/pt.c
    trunk/gcc/cp/tree.c
    trunk/gcc/cp/typeck.c
    trunk/gcc/testsuite/ChangeLog

[Bug c++/45606] [4.5/4.6 Regression] match a method prototyped a typedef alias with the original type (using stdlib)

[dodji at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=45606

--- Comment #6 from Dodji Seketeli <dodji at gcc dot gnu.org> 2010-11-02 13:04:30 UTC ---
This is fixed in 4.6.

For 4.5, I think committing this "as is" is far too risky so I'd wait to see
how "solid" it is for 4.6 and see if I can safely backport this into 4.5 then.

In the mean time I'll see if I can come up with a less risky fix for 4.5.

[Bug c++/45606] [4.5/4.6 Regression] match a method prototyped a typedef alias with the original type (using stdlib)

[rguenth at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=45606

Richard Guenther <rguenth at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|4.5.2                       |4.5.3

--- Comment #7 from Richard Guenther <rguenth at gcc dot gnu.org> 2010-12-16 13:02:50 UTC ---
GCC 4.5.2 is being released, adjusting target milestone.

[Bug c++/45606] [4.5/4.6 Regression] match a method prototyped a typedef alias with the original type (using stdlib)

[bangerth at gmail dot com]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=45606

Wolfgang Bangerth <bangerth at gmail dot com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |bangerth at gmail dot com

--- Comment #8 from Wolfgang Bangerth <bangerth at gmail dot com> 2011-02-27 22:52:54 UTC ---
If this is fixed in 4.6, shouldn't the bug summary be adjusted to make this
clear?

[Bug c++/45606] [4.5 Regression] match a method prototyped a typedef alias with the original type (using stdlib)

[dodji at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=45606

--- Comment #9 from Dodji Seketeli <dodji at gcc dot gnu.org> 2011-02-27 23:24:01 UTC ---
Bug summary adjusted.

[Bug c++/45606] [4.5 Regression] match a method prototyped a typedef alias with the original type (using stdlib)

[rguenth at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=45606

Richard Guenther <rguenth at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|4.5.3                       |4.5.4

--- Comment #10 from Richard Guenther <rguenth at gcc dot gnu.org> 2011-04-28 14:51:02 UTC ---
GCC 4.5.3 is being released, adjusting target milestone.

[Bug c++/45606] [4.5 Regression] match a method prototyped a typedef alias with the original type (using stdlib)

[paolo.carlini at oracle dot com]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=45606

Paolo Carlini <paolo.carlini at oracle dot com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|ASSIGNED                    |RESOLVED
                 CC|gcc-bugs at gcc dot gnu.org |
         Resolution|                            |FIXED

--- Comment #11 from Paolo Carlini <paolo.carlini at oracle dot com> 2012-05-29 11:55:27 UTC ---
I guess we can close this one.