From: Jason Merrill <jason@redhat.com>
Date: Thu, 10 May 2018 18:40:48 +0000 (-0400)
Subject: * class.c (vbase_has_user_provided_move_assign): Use user_provided_p.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1e6da0c98398b96378eb22db915b0df2d5a3aa4a;p=gcc.git

* class.c (vbase_has_user_provided_move_assign): Use user_provided_p.

From-SVN: r260123
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 544806d28a4..d175277af2d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2018-05-09  Jason Merrill  <jason@redhat.com>
 
+	* class.c (vbase_has_user_provided_move_assign): Use
+	user_provided_p.
+
 	* lambda.c (lambda_expr_this_capture): Improve logic.
 
 	* decl.c (make_typename_type): s/parameters/arguments/.
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 0427d1224f7..30323f0a9f6 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -5017,7 +5017,7 @@ vbase_has_user_provided_move_assign (tree type)
     for (ovl_iterator iter (get_class_binding_direct
 			    (type, assign_op_identifier));
 	 iter; ++iter)
-      if (!DECL_ARTIFICIAL (*iter) && move_fn_p (*iter))
+      if (user_provided_p (*iter) && move_fn_p (*iter))
 	return true;
 
   /* Do any of its bases?  */