diff mbox series

[pushed] c++: premature overload resolution redux [PR100078]

Message ID 20210414185918.572987-1-jason@redhat.com
State New
Headers show
Series [pushed] c++: premature overload resolution redux [PR100078] | expand

Commit Message

Jason Merrill April 14, 2021, 6:59 p.m. UTC 
My patch for PR93085 didn't consider that a default template argument can
also make a template dependent.

Tested x86_64-pc-linux-gnu, applying to trunk.

gcc/cp/ChangeLog:

	PR c++/100078
	PR c++/93085
	* pt.c (uses_outer_template_parms): Also look at default
	template argument.

gcc/testsuite/ChangeLog:

	PR c++/100078
	* g++.dg/template/dependent-tmpl2.C: New test.
---
 gcc/cp/pt.c                                     |  5 +++++
 gcc/testsuite/g++.dg/template/dependent-tmpl2.C | 10 ++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/template/dependent-tmpl2.C


base-commit: 9b53edc796d284b6adec7f2996772dbddf4c341e
diff mbox series

Patch

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index f488a5a8c12..0f119a55272 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -10856,6 +10856,7 @@  uses_outer_template_parms (tree decl)
       for (int i = TREE_VEC_LENGTH (parms) - 1; i >= 0; --i)
 	{
 	  tree parm = TREE_VALUE (TREE_VEC_ELT (parms, i));
+	  tree defarg = TREE_PURPOSE (TREE_VEC_ELT (parms, i));
 	  if (TREE_CODE (parm) == PARM_DECL
 	      && for_each_template_parm (TREE_TYPE (parm),
 					 template_parm_outer_level,
@@ -10864,6 +10865,10 @@  uses_outer_template_parms (tree decl)
 	  if (TREE_CODE (parm) == TEMPLATE_DECL
 	      && uses_outer_template_parms (parm))
 	    return true;
+	  if (defarg
+	      && for_each_template_parm (defarg, template_parm_outer_level,
+					 &depth, NULL, /*nondeduced*/true))
+	    return true;
 	}
     }
   tree ci = get_constraints (decl);
diff --git a/gcc/testsuite/g++.dg/template/dependent-tmpl2.C b/gcc/testsuite/g++.dg/template/dependent-tmpl2.C
new file mode 100644
index 00000000000..040ddb47ee6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/dependent-tmpl2.C
@@ -0,0 +1,10 @@ 
+// PR c++/100078
+// { dg-do compile { target c++11 } }
+
+template <bool> struct enable_if;
+template <typename Data> struct HashMapBucket {
+  template <typename T = Data>
+  static typename enable_if<T ::value>::type selectStructure() {
+    selectStructure();
+  }
+};