From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-bugs-return-431307-listarch-gcc-bugs=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 31273 invoked by alias); 8 Oct 2013 12:33:47 -0000
Mailing-List: contact gcc-bugs-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-bugs.gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-bugs/>
List-Post: <mailto:gcc-bugs@gcc.gnu.org>
List-Help: <mailto:gcc-bugs-help@gcc.gnu.org>
Sender: gcc-bugs-owner@gcc.gnu.org
Received: (qmail 31225 invoked by uid 55); 8 Oct 2013 12:33:43 -0000
From: "redi at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug libstdc++/58659] Construction of shared_ptr from unique_ptr mismatches new/delete and std::allocator for __shared_ptr_count
Date: Tue, 08 Oct 2013 12:33:00 -0000
X-Bugzilla-Reason: CC
X-Bugzilla-Type: changed
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: gcc
X-Bugzilla-Component: libstdc++
X-Bugzilla-Version: 4.8.1
X-Bugzilla-Keywords:
X-Bugzilla-Severity: normal
X-Bugzilla-Who: redi at gcc dot gnu.org
X-Bugzilla-Status: ASSIGNED
X-Bugzilla-Priority: P3
X-Bugzilla-Assigned-To: redi at gcc dot gnu.org
X-Bugzilla-Target-Milestone: 4.8.2
X-Bugzilla-Flags:
X-Bugzilla-Changed-Fields:
Message-ID: <bug-58659-4-Cjmp8bwsDt@http.gcc.gnu.org/bugzilla/>
In-Reply-To: <bug-58659-4@http.gcc.gnu.org/bugzilla/>
References: <bug-58659-4@http.gcc.gnu.org/bugzilla/>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
X-Bugzilla-URL: http://gcc.gnu.org/bugzilla/
Auto-Submitted: auto-generated
MIME-Version: 1.0
X-SW-Source: 2013-10/txt/msg00451.txt.bz2

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58659

--- Comment #2 from Jonathan Wakely <redi at gcc dot gnu.org> ---
Author: redi
Date: Tue Oct  8 12:33:37 2013
New Revision: 203274

URL: http://gcc.gnu.org/viewcvs?rev=203274&root=gcc&view=rev
Log:
    PR libstdc++/58659
    * include/bits/shared_ptr_base.h (__shared_count::__shared_count(P,D)):
    Delegate to constructor taking allocator.
    (__shared_count::_S_create_from_up): Inline into ...
    (__shared_count::__shared_count(unique_ptr<Y,D>&&): Here. Use
    std::conditional instead of constrained overloads. Allocate memory
    using the allocator type that will be used for deallocation.
    * testsuite/20_util/shared_ptr/cons/58659.cc: New.
    * testsuite/20_util/shared_ptr/cons/43820_neg.cc: Adjust.

Added:
    trunk/libstdc++-v3/testsuite/20_util/shared_ptr/cons/58659.cc
Modified:
    trunk/libstdc++-v3/ChangeLog
    trunk/libstdc++-v3/include/bits/shared_ptr_base.h
    trunk/libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820_neg.cc