I changed the implementation to associate constraints with template decls (actually lang_decl_min) rather than template_info.
The handling of constrained non-template member functions changes a
little. When a class template is instantiated the instantiated
requirements are associated directly with the synthesized function
declaration since there is no template to attach them to. These are
checked in add_function_candidate.
This does not include support partial template specialization or
friend templates yet.
I did update part of the implementation for inherited constructors,
but its probably incomplete. I think I may also need to propagate
constraints from constrained non-template constructors as well.
Changelog:
2013-06-22 Andrew Sutton <andrew.n.sut...@gmail.com>
* gcc/cp/cp-tree.h (tree_template_info). Remove constraint from
template info.
(check_template_info): Removed (unused).
(TI_CONSTRAINT): Removed (no longer needed) along with related macros.
(DECL_CONSTRAONTS): New.
(build_template_inof): Removed overload taking constraints.
(get_constraints): Removed (no longer needed).
* gcc/cp/class.c (are_constrained_member_overlaods): Allow constrained
member function templates to be differentiated as overloads.
* gcc/cp/decl.c (decls_match): Only compare constraints on
declarations.
(grokfndecl): Don't pass constraints to build_template_info.
* gcc/cp/tree.c (bind_template_template_parm): Don't pass constraints
to build_template_info.
* gcc/cp/pt.c (build_template_info): Removed overload taking
constraints.
(check_explicit_specialization): Don't build new constraints for
template info.
(build_template_decl): Pass constraints. Update docs.
(process_partial_specialization): Stub out support for constrained
partial specialiations.
(push_template_decl_real): Build template decls with current template
reqs. Don't pass constraints to build_template_info.
(add_inherited_template_parms): Build new constraints from inherited
template constructors.
(redeclare_class_template): Update to new constraint interface.
(is_compatible_template_arg): Update to new constraint interface.
(lookup_template_class_1): Don't build new constraints or pass them to
build_template_info.
(instantiate_class_template_1): Update to new constraints interface.
(tsubst_decl): Don't build new constraints or pass them to
build_template_info. For function templates, explicitly instantiate
new constraints for member functions of class templates.
* gcc/cp/semantics.c: Associate constraints with template template
parms directly, not through template info.
* gcc/cp/constraint.cc (get_constraints): Remove (no longer needed)
along with related functions.
(check_constraints): Update to use new constraints interface.
(equivalently_constrained): Update to use new constraints interface.
(more_constrained): Update to use new constraints interface.
* gcc/cp/parser.cpp (cp_parser_late_parsing_for_member): Update to use
new constraints interface.
* gcc/cp/call.c (add_function_candidate): Update to use new constraints
interface.
Andrew
template-decl.patch
Description: Binary data
