From a5cfa13ab9ef5b9a740129fca6b73acea436c493 Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@acm.org>
Date: Mon, 29 May 2017 16:50:41 +0000
Subject: [PATCH] PR c++/80891 (#4)

	PR c++/80891 (#4)
	* ptree.c (cxx_print_xnode): Show internal OVERLOAD structure.
	* tree.c (ovl_insert, ovl_iterator_remove_node): Fix copying
	assert.

	PR c++/80891 (#4)
	* g++.dg/lookup/pr80891-4.C: New.

From-SVN: r248576
---
 gcc/cp/ChangeLog                        |  4 ++++
 gcc/cp/ptree.c                          |  7 ++-----
 gcc/cp/tree.c                           |  4 ++--
 gcc/testsuite/ChangeLog                 |  3 +++
 gcc/testsuite/g++.dg/lookup/pr80891-4.C | 13 +++++++++++++
 5 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/lookup/pr80891-4.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4a9ba45212d..faae715de4a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2017-05-29  Nathan Sidwell  <nathan@acm.org>
 
+	PR c++/80891 (#4)
+	* ptree.c (cxx_print_xnode): Show internal OVERLOAD structure.
+	* tree.c (ovl_insert, ovl_iterator_remove_node): Fix copying assert.
+
 	Stat hack representation
 	* name-lookup.c (STAT_HACK_P, STAT_TYPE, STAT_DECL,
 	MAYBE_STAT_DECL, MAYBE_STAT_TYPE): New.
diff --git a/gcc/cp/ptree.c b/gcc/cp/ptree.c
index a2977e86e7b..f8e879ef656 100644
--- a/gcc/cp/ptree.c
+++ b/gcc/cp/ptree.c
@@ -236,11 +236,8 @@ cxx_print_xnode (FILE *file, tree node, int indent)
 		  indent + 4);
       break;
     case OVERLOAD:
-      print_node (file, "name", OVL_NAME (node), indent+4);
-      for (ovl_iterator iter (node, true); iter; ++iter)
-	print_node (file,
-		    TREE_CODE (*iter) == OVERLOAD ? "inner" : "function",
-		    *iter, indent+4);
+      print_node (file, "function", OVL_FUNCTION (node), indent+4);
+      print_node (file, "next", OVL_CHAIN (node), indent+4);
       break;
     case TEMPLATE_PARM_INDEX:
       print_node (file, "decl", TEMPLATE_PARM_DECL (node), indent+4);
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 37297d2a465..411c9f3b180 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -2170,7 +2170,7 @@ ovl_insert (tree fn, tree maybe_ovl, bool using_p)
 		       | (OVL_USING_P (maybe_ovl) << 0))))
     {
       gcc_checking_assert (!OVL_LOOKUP_P (maybe_ovl)
-			   && (!OVL_USED_P (maybe_ovl) || !copying));
+			   && (!copying || OVL_USED_P (maybe_ovl)));
       if (OVL_USED_P (maybe_ovl))
 	{
 	  copying = true;
@@ -2264,7 +2264,7 @@ ovl_iterator::remove_node (tree overload, tree node)
     {
       tree probe = *slot;
       gcc_checking_assert (!OVL_LOOKUP_P (probe)
-			   && (!OVL_USED_P (probe) || !copying));
+			   && (!copying || OVL_USED_P (probe)));
       if (OVL_USED_P (probe))
 	{
 	  copying = true;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 98e06f923bf..4eb53a7ce1b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2017-05-29  Nathan Sidwell  <nathan@acm.org>
 
+	PR c++/80891 (#4)
+	* g++.dg/lookup/pr80891-4.C: New.
+
 	PR c++/80891 (#1)
 	* g++.dg/lookup/pr80891-1.C: New.
 
diff --git a/gcc/testsuite/g++.dg/lookup/pr80891-4.C b/gcc/testsuite/g++.dg/lookup/pr80891-4.C
new file mode 100644
index 00000000000..d5366134966
--- /dev/null
+++ b/gcc/testsuite/g++.dg/lookup/pr80891-4.C
@@ -0,0 +1,13 @@
+// PR c++/80891 part 4
+// Inserting into an immutable overload set
+
+namespace tuples {
+template <class, class> void get();
+template <int> void get();
+}
+using tuples::get;
+template <class RandomAccessIterator> void make_iterator_vertex_map() {
+  RandomAccessIterator a;
+  a, get;
+}
+template <class> void get();
-- 
2.30.2