From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Wed, 16 Dec 2015 21:45:14 +0000 (+0000)
Subject: pt.c (comp_template_args): Remove.
X-Git-Tag: basepoints/gcc-7~2041
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cb6583c5ff97ef55e49a07d0367e8445e494dec;p=thirdparty%2Fgcc.git

pt.c (comp_template_args): Remove.

2015-12-16  Paolo Carlini  <paolo.carlini@oracle.com>

	* pt.c (comp_template_args): Remove.
	(comp_template_args_with_info): Rename to comp_template_args;
	not static.
	(add_pending_template): Adjust call.
	* cp-tree.h (comp_template_args): Add default arguments.

From-SVN: r231723
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 488b2ad0ad01..46b67125a5b8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2015-12-16  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* pt.c (comp_template_args): Remove.
+	(comp_template_args_with_info): Rename to comp_template_args;
+	not static.
+	(add_pending_template): Adjust call.
+	* cp-tree.h (comp_template_args): Add default arguments.
+
 2015-12-16  Jason Merrill  <jason@redhat.com>
 
 	PR c++/68309
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index d5e3acdb67a5..058324f32a58 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -6115,7 +6115,8 @@ extern int template_class_depth			(tree);
 extern int is_specialization_of			(tree, tree);
 extern bool is_specialization_of_friend		(tree, tree);
 extern tree get_pattern_parm			(tree, tree);
-extern int comp_template_args			(tree, tree);
+extern int comp_template_args			(tree, tree, tree * = NULL,
+						 tree * = NULL);
 extern tree maybe_process_partial_specialization (tree);
 extern tree most_specialized_instantiation	(tree);
 extern void print_candidates			(tree);
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 5cf2497f79a2..da57fb2a45c6 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -7881,9 +7881,9 @@ template_args_equal (tree ot, tree nt)
    template arguments.  Returns 0 otherwise, and updates OLDARG_PTR and
    NEWARG_PTR with the offending arguments if they are non-NULL.  */
 
-static int
-comp_template_args_with_info (tree oldargs, tree newargs,
-			      tree *oldarg_ptr, tree *newarg_ptr)
+int
+comp_template_args (tree oldargs, tree newargs,
+		    tree *oldarg_ptr, tree *newarg_ptr)
 {
   int i;
 
@@ -7913,15 +7913,6 @@ comp_template_args_with_info (tree oldargs, tree newargs,
   return 1;
 }
 
-/* Returns 1 iff the OLDARGS and NEWARGS are in fact identical sets
-   of template arguments.  Returns 0 otherwise.  */
-
-int
-comp_template_args (tree oldargs, tree newargs)
-{
-  return comp_template_args_with_info (oldargs, newargs, NULL, NULL);
-}
-
 static void
 add_pending_template (tree d)
 {
@@ -19051,8 +19042,8 @@ unify_pack_expansion (tree tparms, tree targs, tree packed_parms,
 	  tree bad_old_arg = NULL_TREE, bad_new_arg = NULL_TREE;
 	  tree old_args = ARGUMENT_PACK_ARGS (old_pack);
 
-	  if (!comp_template_args_with_info (old_args, new_args,
-					     &bad_old_arg, &bad_new_arg))
+	  if (!comp_template_args (old_args, new_args,
+				   &bad_old_arg, &bad_new_arg))
 	    /* Inconsistent unification of this parameter pack.  */
 	    return unify_parameter_pack_inconsistent (explain_p,
 						      bad_old_arg,