From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id B6D6C3860C32; Fri, 18 Jun 2021 12:56:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B6D6C3860C32 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r10-9936] libstdc++: Reject std::make_shared [PR 99006] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 0fd8e3ac9db8aed59db610b29d83a49b89a638c1 X-Git-Newrev: 36d6e7fe997aa85dc64b13ce4bb3c2e51e13cd36 Message-Id: <20210618125623.B6D6C3860C32@sourceware.org> Date: Fri, 18 Jun 2021 12:56:23 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2021 12:56:23 -0000 https://gcc.gnu.org/g:36d6e7fe997aa85dc64b13ce4bb3c2e51e13cd36 commit r10-9936-g36d6e7fe997aa85dc64b13ce4bb3c2e51e13cd36 Author: Jonathan Wakely Date: Thu Apr 22 15:46:51 2021 +0100 libstdc++: Reject std::make_shared [PR 99006] Prior to C++20 it should be ill-formed to use std::make_shared with an array type (and we don't support the C++20 feature to make it valid yet anyway). libstdc++-v3/ChangeLog: PR libstdc++/99006 * include/bits/shared_ptr.h (allocate_shared): Assert that _Tp is not an array type. * include/bits/shared_ptr_base.h (__allocate_shared): Likewise. * testsuite/20_util/shared_ptr/creation/99006.cc: New test. (cherry picked from commit 55650236cd97d81f42f9fdb4f6bcb12babafe51f) Diff: --- libstdc++-v3/include/bits/shared_ptr.h | 2 ++ libstdc++-v3/include/bits/shared_ptr_base.h | 2 ++ libstdc++-v3/testsuite/20_util/shared_ptr/creation/99006.cc | 9 +++++++++ 3 files changed, 13 insertions(+) diff --git a/libstdc++-v3/include/bits/shared_ptr.h b/libstdc++-v3/include/bits/shared_ptr.h index 0baec4e0882..af7a696adb0 100644 --- a/libstdc++-v3/include/bits/shared_ptr.h +++ b/libstdc++-v3/include/bits/shared_ptr.h @@ -856,6 +856,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inline shared_ptr<_Tp> allocate_shared(const _Alloc& __a, _Args&&... __args) { + static_assert(!is_array<_Tp>::value, "make_shared not supported"); + return shared_ptr<_Tp>(_Sp_alloc_shared_tag<_Alloc>{__a}, std::forward<_Args>(__args)...); } diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h index 219007b2c07..792d8344664 100644 --- a/libstdc++-v3/include/bits/shared_ptr_base.h +++ b/libstdc++-v3/include/bits/shared_ptr_base.h @@ -1870,6 +1870,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inline __shared_ptr<_Tp, _Lp> __allocate_shared(const _Alloc& __a, _Args&&... __args) { + static_assert(!is_array<_Tp>::value, "make_shared not supported"); + return __shared_ptr<_Tp, _Lp>(_Sp_alloc_shared_tag<_Alloc>{__a}, std::forward<_Args>(__args)...); } diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/creation/99006.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/creation/99006.cc new file mode 100644 index 00000000000..d5f7a5da5e9 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/shared_ptr/creation/99006.cc @@ -0,0 +1,9 @@ +// FIXME: This should use { target { ! c++20 } } +// { dg-do compile } + +#include + +auto p = std::make_shared(2); // { dg-error "here" } +auto q = std::make_shared(1, 2); // { dg-error "here" } + +// { dg-prune-output "static assertion failed" }