From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id D4F513854810; Thu, 16 Mar 2023 16:51:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D4F513854810 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678985487; bh=kM3ZGlbKJEtzd+jlNxpo3cjFsefEpv2Xrd3uUT63QHw=; h=From:To:Subject:Date:From; b=Q58dLAMErW+gP5DivQBchkYlOWtEEeuuuaPrpDkXrhdLE9s7pBpZEmaLUb+UOA6MG 3fXnlwTbYLRxW6pe58CE0gp9jHPW9y1f78Grl4M0ZjQ4vA36yTZOufiFnfNl8doj4A pRpAm6HY/KWp4nhqk78kpbW35snypNJ7stBJerBI= 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 r11-10581] libstdc++: Fix std::filesystem errors with -fkeep-inline-functions [PR108636] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 061700c9f6f0f9f4219ddeb236d55764b42869b6 X-Git-Newrev: 05fa584bbb5534ec7a763a2d0e6d89cf251534f5 Message-Id: <20230316165127.D4F513854810@sourceware.org> Date: Thu, 16 Mar 2023 16:51:27 +0000 (GMT) List-Id: https://gcc.gnu.org/g:05fa584bbb5534ec7a763a2d0e6d89cf251534f5 commit r11-10581-g05fa584bbb5534ec7a763a2d0e6d89cf251534f5 Author: Jonathan Wakely Date: Thu Feb 2 14:06:40 2023 +0000 libstdc++: Fix std::filesystem errors with -fkeep-inline-functions [PR108636] With -fkeep-inline-functions there are linker errors when including . This happens because there are some filesystem::path constructors defined inline which call non-exported functions defined in the library. That's usually not a problem, because those constructors are only called by code that's also inside the library. But when the header is compiled with -fkeep-inline-functions those inline functions are emitted even though they aren't called. That then creates an undefined reference to the other library internals. The fix is to just move the private constructors into the library where they are called. That way they are never even seen by users, and so not compiled even if -fkeep-inline-functions is used. libstdc++-v3/ChangeLog: PR libstdc++/108636 * include/bits/fs_path.h (path::path(string_view, _Type)) (path::_Cmpt::_Cmpt(string_view, _Type, size_t)): Move inline definitions to ... * src/c++17/fs_path.cc: ... here. * testsuite/27_io/filesystem/path/108636.cc: New test. (cherry picked from commit db8d6fc572ec316ccfcf70b1dffe3be0b1b37212) Diff: --- libstdc++-v3/include/bits/fs_path.h | 10 ++-------- libstdc++-v3/src/c++17/fs_path.cc | 13 +++++++++++++ libstdc++-v3/testsuite/27_io/filesystem/path/108636.cc | 8 ++++++++ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/include/bits/fs_path.h b/libstdc++-v3/include/bits/fs_path.h index 79085c0c1bd..f37e7e8909f 100644 --- a/libstdc++-v3/include/bits/fs_path.h +++ b/libstdc++-v3/include/bits/fs_path.h @@ -558,12 +558,7 @@ namespace __detail _Multi = 0, _Root_name, _Root_dir, _Filename }; - path(basic_string_view __str, _Type __type) - : _M_pathname(__str) - { - __glibcxx_assert(__type != _Type::_Multi); - _M_cmpts.type(__type); - } + path(basic_string_view __str, _Type __type); enum class _Split { _Stem, _Extension }; @@ -809,8 +804,7 @@ namespace __detail struct path::_Cmpt : path { - _Cmpt(basic_string_view __s, _Type __t, size_t __pos) - : path(__s, __t), _M_pos(__pos) { } + _Cmpt(basic_string_view __s, _Type __t, size_t __pos); _Cmpt() : _M_pos(-1) { } diff --git a/libstdc++-v3/src/c++17/fs_path.cc b/libstdc++-v3/src/c++17/fs_path.cc index 967d9471134..5d3f40a9ddf 100644 --- a/libstdc++-v3/src/c++17/fs_path.cc +++ b/libstdc++-v3/src/c++17/fs_path.cc @@ -186,6 +186,19 @@ struct path::_Parser { return origin + c.str.data() - input.data(); } }; +inline +path::path(basic_string_view __str, _Type __type) +: _M_pathname(__str) +{ + __glibcxx_assert(__type != _Type::_Multi); + _M_cmpts.type(__type); +} + +inline +path::_Cmpt::_Cmpt(basic_string_view __s, _Type __t, size_t __pos) +: path(__s, __t), _M_pos(__pos) +{ } + struct path::_List::_Impl { using value_type = _Cmpt; diff --git a/libstdc++-v3/testsuite/27_io/filesystem/path/108636.cc b/libstdc++-v3/testsuite/27_io/filesystem/path/108636.cc new file mode 100644 index 00000000000..d58de461090 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/filesystem/path/108636.cc @@ -0,0 +1,8 @@ +// { dg-do link { target c++17 } } +// { dg-options "-fkeep-inline-functions" } + +#include +int main() +{ + // PR libstdc++/108636 - link failure with -fkeep-inline-functions +}