From: Jason Merrill <jason@redhat.com>
Date: Wed, 29 Jun 2011 14:34:47 +0000 (-0400)
Subject: method.c (maybe_explain_implicit_delete): Use pointer_set instead of htab.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=874d29e5bebbebee89836e041a0de18d183d7303;p=gcc.git

method.c (maybe_explain_implicit_delete): Use pointer_set instead of htab.

	* method.c (maybe_explain_implicit_delete): Use pointer_set
	instead of htab.

From-SVN: r175645
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 61778830bf1..2cd5c0a4324 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2011-06-29  Jason Merrill  <jason@redhat.com>
 
+	* method.c (maybe_explain_implicit_delete): Use pointer_set
+	instead of htab.
+
 	* class.c (finalize_literal_type_property): Update conditions.
 	* method.c (defaulted_late_check): Set TYPE_HAS_CONSTEXPR_CTOR.
 
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index de43a386f77..ec1c5025278 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -1320,21 +1320,17 @@ maybe_explain_implicit_delete (tree decl)
   if (DECL_DEFAULTED_FN (decl))
     {
       /* Not marked GTY; it doesn't need to be GC'd or written to PCH.  */
-      static htab_t explained_htab;
-      void **slot;
+      static struct pointer_set_t *explained;
 
       special_function_kind sfk;
       location_t loc;
       bool informed;
       tree ctype;
 
-      if (!explained_htab)
-	explained_htab = htab_create (37, htab_hash_pointer,
-				      htab_eq_pointer, NULL);
-      slot = htab_find_slot (explained_htab, decl, INSERT);
-      if (*slot)
+      if (!explained)
+	explained = pointer_set_create ();
+      if (pointer_set_insert (explained, decl))
 	return true;
-      *slot = decl;
 
       sfk = special_function_p (decl);
       ctype = DECL_CONTEXT (decl);