aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/pt.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/lookup/pr84702.C13
4 files changed, 26 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 001cb6a..3218814 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-05 Nathan Sidwell <nathan@acm.org>
+
+ PR c++/84702
+ * pt.c (process_template_arg): Mark lookup_keep on a default arg.
+
2018-03-05 Marek Polacek <polacek@redhat.com>
PR c++/84707
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index c81bd50..89024c1 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -4425,6 +4425,9 @@ process_template_parm (tree list, location_t parm_loc, tree parm,
pushdecl (decl);
+ if (defval && TREE_CODE (defval) == OVERLOAD)
+ lookup_keep (defval, true);
+
/* Build the parameter node linking the parameter declaration,
its default argument (if any), and its constraints (if any). */
parm = build_tree_list (defval, parm);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e80a728..9f9afb0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-05 Nathan Sidwell <nathan@acm.org>
+
+ PR c++/84702
+ * g++.dg/lookup/pr84702.C: New.
+
2018-03-05 Jakub Jelinek <jakub@redhat.com>
PR target/84564
diff --git a/gcc/testsuite/g++.dg/lookup/pr84702.C b/gcc/testsuite/g++.dg/lookup/pr84702.C
new file mode 100644
index 0000000..6b9e1b4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/lookup/pr84702.C
@@ -0,0 +1,13 @@
+// PR c++/84702 failure to mark overload to keep
+// { dg-do compile { target c++11 } }
+
+void a ();
+
+namespace {
+ void a (int);
+}
+
+template<void (&b)() = a>
+void c () {
+ c ();
+}