* 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 544806d28a43f1e0b93a9da1dd96c7a0b7405ae6..d175277af2db2d8440841e18bd23602c234283db 100644 (file)
--- 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 0427d1224f74d2d3448a6c4f066bb5dbe70ab801..30323f0a9f61a6da04943e16cb022aad5c3b5a54 100644 (file)
--- 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?  */