From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 8C41F3861815; Mon, 9 Nov 2020 14:29:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8C41F3861815 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-4839] libstdc++: Use 'inline' consistently in std::exception_ptr [PR 97729] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 99bf3a817b9d31905dd12448e853ad2685635250 X-Git-Newrev: 0af3930a497e022597a08fa1bcef5e453bfa636f Message-Id: <20201109142904.8C41F3861815@sourceware.org> Date: Mon, 9 Nov 2020 14:29:04 +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: Mon, 09 Nov 2020 14:29:04 -0000 https://gcc.gnu.org/g:0af3930a497e022597a08fa1bcef5e453bfa636f commit r11-4839-g0af3930a497e022597a08fa1bcef5e453bfa636f Author: Jonathan Wakely Date: Mon Nov 9 10:16:07 2020 +0000 libstdc++: Use 'inline' consistently in std::exception_ptr [PR 97729] With PR c++/67453 fixed we can rely on the 'used' attribute to emit inline constructors and destructors in libsupc++/eh_ptr.cc. This means we don't need to suppress the 'inline' keyword on them in that file, and don't need to force 'always_inline' on them in other files. libstdc++-v3/ChangeLog: PR libstdc++/97729 * libsupc++/exception_ptr.h (exception_ptr::exception_ptr()) (exception_ptr::exception_ptr(const exception_ptr&)) (exception_ptr::~exception_ptr()): Remove 'always_inline' attributes. Use 'inline' unconditionally. Diff: --- libstdc++-v3/libsupc++/exception_ptr.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libstdc++-v3/libsupc++/exception_ptr.h b/libstdc++-v3/libsupc++/exception_ptr.h index 001343ac049..6ae4d4ca944 100644 --- a/libstdc++-v3/libsupc++/exception_ptr.h +++ b/libstdc++-v3/libsupc++/exception_ptr.h @@ -174,19 +174,13 @@ namespace std }; _GLIBCXX_EH_PTR_USED -#ifndef _GLIBCXX_EH_PTR_COMPAT - __attribute__((__always_inline__)) // XXX see PR 97729 inline -#endif exception_ptr::exception_ptr() _GLIBCXX_NOEXCEPT : _M_exception_object(0) { } _GLIBCXX_EH_PTR_USED -#ifndef _GLIBCXX_EH_PTR_COMPAT - __attribute__((__always_inline__)) inline -#endif exception_ptr::exception_ptr(const exception_ptr& __other) _GLIBCXX_NOEXCEPT : _M_exception_object(__other._M_exception_object) { @@ -195,10 +189,7 @@ namespace std } _GLIBCXX_EH_PTR_USED -#ifndef _GLIBCXX_EH_PTR_COMPAT - __attribute__((__always_inline__)) inline -#endif exception_ptr::~exception_ptr() _GLIBCXX_USE_NOEXCEPT { if (_M_exception_object)