From patchwork Tue Jul 18 12:07:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 790223 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-458409-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="Apvt73Qf"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xBf7F0gPFz9rxl for ; Tue, 18 Jul 2017 22:07:51 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=mAzIiT6cIhHlKv5HCBQOJ4MPUUV6W2y9yeYC9vQ6MB3T+EVEHb eu8YKTlVsFV5Q6R4uEZwkCFrgR399bQBaPcVGTmipG0AksGyBacPw98irURu10p2 98XTo2G5QZD/rLZSqahhcez5vZ6zY7ZMFRknc/8qN60UWDBcYQP7mfAeI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=cvzvLzgXjvkXk02Cqzoqd7r8tK0=; b=Apvt73Qfj468o9RI4LWf WofNX9lH5hnBnZ0X4cEKCg1+qTPtM/p5itthlk/YebzDxrZCjdSDMK1w6nY6UFbu dPgInt7ilxVfZsilKUTpkVle9ydRlRSm4lV7Z/jqK7M+VVPh45UPgluyj5a1ZhvG kG2wASye/7QbGn4fd/r/L9U= Received: (qmail 103594 invoked by alias); 18 Jul 2017 12:07:42 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 103559 invoked by uid 89); 18 Jul 2017 12:07:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-10.6 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-yw0-f169.google.com Received: from mail-yw0-f169.google.com (HELO mail-yw0-f169.google.com) (209.85.161.169) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 18 Jul 2017 12:07:37 +0000 Received: by mail-yw0-f169.google.com with SMTP id x125so6772918ywa.0 for ; Tue, 18 Jul 2017 05:07:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:to:from:subject:message-id:date :user-agent:mime-version:content-language; bh=6ErRmZRT+tj7DU728sQ0zTKhfn1YA8lwsU5BQWzbQcQ=; b=HxyQMIKO7sNWqLingxGcLxoIKjAx+jplaRZy8PuobJ7TQ+WSrHd59Sj9QSvlMQUPKg /AIgNbuztSHPuM5UCQQs8P4MSIpXqFo+dgIlyrgVawODLIOXK5isz6WmBQuGEmeI1bye iU1M7ONChBqfnE2h+KVJ60rRVVrKn5IO+Oc5IMrm7frgrc/W+P8DDjBsPgkltSrRwZkn PbtzhLcu1qG+ghDHiY8A7VZagaPbgKcMALw/fAUjyHMf9aX1H3mmIHIffNqaMq/qxby9 zhdcMJKXlOiB1/bXm18F/p1/Vtn37ENm4scLdTzYtBOiyO7aaWF1wUTdRsPGDMmjFczX sd0w== X-Gm-Message-State: AIVw111y/DP1CfCezubd1nkLQA0fnTOdN7MMi3oAU8EA406BAvLPTOvv cTsQi4L+z0tUZQ== X-Received: by 10.129.99.137 with SMTP id x131mr961873ywb.53.1500379655514; Tue, 18 Jul 2017 05:07:35 -0700 (PDT) Received: from ?IPv6:2620:10d:c0a3:20fb:7500:e7fb:4a6f:2254? ([2620:10d:c091:200::3:fb48]) by smtp.googlemail.com with ESMTPSA id i4sm710580ywc.68.2017.07.18.05.07.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 05:07:34 -0700 (PDT) To: GCC Patches From: Nathan Sidwell Subject: [C++ PATCH] move ctors and assign (again) Message-ID: <31bb6f5c-6e88-8c31-0d15-7db4df7fb6b0@acm.org> Date: Tue, 18 Jul 2017 08:07:33 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In addition to the user-declared checkers, we also have a couple of 'do we have at all' predicates. Used exactly once when completing a struct and determining the state of the appropriate LAZY flags. Merged with the attached patch committed to trunk. Now the two functions are stunningly similar a further merging may be in the near future ... nathan 2017-07-18 Nathan Sidwell * class.c (classtype_has_move_assign_or_move_ctor): Declare. (add_implicitly_declared_members): Use it. (type_has_move_constructor, type_has_move_assign): Merge into ... (classtype_has_move_assign_or_move_ctor): ... this new function. * cp-tree.h (type_has_move_constructor, type_has_move_assign): Delete. Index: class.c =================================================================== --- class.c (revision 250281) +++ class.c (working copy) @@ -150,6 +150,7 @@ static void build_base_fields (record_la static void check_methods (tree); static void remove_zero_width_bit_fields (tree); static bool accessible_nvdtor_p (tree); +static bool classtype_has_move_assign_or_move_ctor (tree); /* Used by find_flexarrays and related functions. */ struct flexmems_t; @@ -3384,7 +3385,7 @@ add_implicitly_declared_members (tree t, bool move_ok = false; if (cxx_dialect >= cxx11 && CLASSTYPE_LAZY_DESTRUCTOR (t) && !TYPE_HAS_COPY_CTOR (t) && !TYPE_HAS_COPY_ASSIGN (t) - && !type_has_move_constructor (t) && !type_has_move_assign (t)) + && !classtype_has_move_assign_or_move_ctor (t)) move_ok = true; /* [class.ctor] @@ -5456,38 +5457,19 @@ type_has_virtual_destructor (tree type) return (dtor && DECL_VIRTUAL_P (dtor)); } -/* Returns true iff class T has a move constructor. */ +/* Returns true iff class T has move assignment or move constructor. */ -bool -type_has_move_constructor (tree t) +static bool +classtype_has_move_assign_or_move_ctor (tree t) { - if (CLASSTYPE_LAZY_MOVE_CTOR (t)) - { - gcc_assert (COMPLETE_TYPE_P (t)); - lazily_declare_fn (sfk_move_constructor, t); - } + gcc_assert (!CLASSTYPE_LAZY_MOVE_CTOR (t) + && !CLASSTYPE_LAZY_MOVE_ASSIGN (t)); - if (!CLASSTYPE_METHOD_VEC (t)) - return false; - - for (ovl_iterator iter (CLASSTYPE_CONSTRUCTORS (t)); iter; ++iter) + for (ovl_iterator iter (lookup_fnfields_slot_nolazy + (t, ctor_identifier)); iter; ++iter) if (move_fn_p (*iter)) return true; - return false; -} - -/* Returns true iff class T has a move assignment operator. */ - -bool -type_has_move_assign (tree t) -{ - if (CLASSTYPE_LAZY_MOVE_ASSIGN (t)) - { - gcc_assert (COMPLETE_TYPE_P (t)); - lazily_declare_fn (sfk_move_assignment, t); - } - for (ovl_iterator iter (lookup_fnfields_slot_nolazy (t, cp_assignment_operator_id (NOP_EXPR))); iter; ++iter) Index: cp-tree.h =================================================================== --- cp-tree.h (revision 250280) +++ cp-tree.h (working copy) @@ -6023,8 +6023,6 @@ extern tree default_init_uninitialized_p extern bool trivial_default_constructor_is_constexpr (tree); extern bool type_has_constexpr_default_constructor (tree); extern bool type_has_virtual_destructor (tree); -extern bool type_has_move_constructor (tree); -extern bool type_has_move_assign (tree); extern bool classtype_has_user_move_assign_or_move_ctor_p (tree); extern bool type_build_ctor_call (tree); extern bool type_build_dtor_call (tree);