From patchwork Mon May 14 14:27:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 912959 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-477650-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="IE11MtTI"; 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 40l32d0WtDz9s0W for ; Tue, 15 May 2018 00:28:07 +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:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=FYsz51SBRCy0OBpHHu3hPmq1pVph16psMSRC5jyF8maD1xP9ZDW2H 8nGHSex6nebumVoaL5HIFTsLSwnUZ4jUSoQTePMAycZwugTt7g3xo36LAWcbvHRI sA8hoJV9bESIx0f5Bea8ipfSz5WLhdlZmdxYey9KHYwoHBguD6yqzc= 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:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=jKx86+du/c5N4V0kxUxI4CST+BQ=; b=IE11MtTI3T91yff51wFS fzevk+sZad7RPVmweUvIwbuhmdfhwc7adxZHjLqdHcrghkfLaV7lwucHk1aFqoRC KN7EJpGLrtM89CgdWGmiBhzakxCmo11bMEMQhk0a+KziYVtA2Wqw5gvSZEfFzkIQ 1r/DTXtW6a+qZ7ZFV11+7Gw= Received: (qmail 81868 invoked by alias); 14 May 2018 14:27:53 -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 81836 invoked by uid 89); 14 May 2018 14:27:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=jwakelyredhatcom, U*jwakely, jwakely@redhat.com X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 14 May 2018 14:27:50 +0000 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6A48510C16B; Mon, 14 May 2018 14:27:49 +0000 (UTC) Received: from localhost (unknown [10.33.36.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0CF3060BE7; Mon, 14 May 2018 14:27:48 +0000 (UTC) Date: Mon, 14 May 2018 15:27:48 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH] PR libstdc++/82966 fix swapping of node handles Message-ID: <20180514142748.GA21471@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.9.2 (2017-12-15) PR libstdc++/82966 * include/bits/node_handle.h (_Node_handle_common::_M_swap): Use value instead of type. * testsuite/23_containers/set/modifiers/node_swap.cc: New. Tested powerpc64le-linux, committed to trunk. Backports to gcc-7 and gcc-8 will follow. commit b6848af169ab5e7d344b01fd124c1f07a92d951e Author: Jonathan Wakely Date: Mon May 14 15:10:39 2018 +0100 PR libstdc++/82966 fix swapping of node handles PR libstdc++/82966 * include/bits/node_handle.h (_Node_handle_common::_M_swap): Use value instead of type. * testsuite/23_containers/set/modifiers/node_swap.cc: New. diff --git a/libstdc++-v3/include/bits/node_handle.h b/libstdc++-v3/include/bits/node_handle.h index c02aca024bd..8bb4f3c0abc 100644 --- a/libstdc++-v3/include/bits/node_handle.h +++ b/libstdc++-v3/include/bits/node_handle.h @@ -109,7 +109,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { using std::swap; swap(_M_ptr, __nh._M_ptr); - if (_AllocTraits::propagate_on_container_swap + if (_AllocTraits::propagate_on_container_swap::value || !_M_alloc || !__nh._M_alloc) _M_alloc.swap(__nh._M_alloc); else diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/node_swap.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/node_swap.cc new file mode 100644 index 00000000000..8957d6e125a --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/node_swap.cc @@ -0,0 +1,48 @@ +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do run { target c++17 } } + +#include +#include + +void +test01() +{ + // PR libstdc++/82966 + std::set::node_type n1, n2; + n1.swap(n2); + VERIFY( n1.empty() ); + VERIFY( n2.empty() ); +} + +void +test02() +{ + std::set s{1, 2}; + std::set::node_type n1 = s.extract(1), n2; + swap(n1, n2); + VERIFY( n1.empty() ); + VERIFY( !n2.empty() ); +} + +int main() +{ + test01(); + test02(); +}