From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 17AD63857424; Tue, 12 Oct 2021 16:28:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 17AD63857424 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-10186] libstdc++: Fix inefficiency in filesystem::absolute [PR99876] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 533bcd40fc4a080997e704ed0ff9a7673bcc7ee0 X-Git-Newrev: 154316697dbea9ba96bc14680b642b3ae35dadbd Message-Id: <20211012162821.17AD63857424@sourceware.org> Date: Tue, 12 Oct 2021 16:28:21 +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: Tue, 12 Oct 2021 16:28:21 -0000 https://gcc.gnu.org/g:154316697dbea9ba96bc14680b642b3ae35dadbd commit r10-10186-g154316697dbea9ba96bc14680b642b3ae35dadbd Author: Jonathan Wakely Date: Fri Aug 27 10:59:54 2021 +0100 libstdc++: Fix inefficiency in filesystem::absolute [PR99876] When the path is already absolute, the call to current_path() is wasteful, because operator/ will ignore the left operand anyway. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: PR libstdc++/99876 * src/c++17/fs_ops.cc (fs::absolute): Call non-throwing form, to avoid unnecessary current_path() call. (cherry picked from commit 07b990ee23e0c7a92d362dbb25fd5d57d95eb8be) Diff: --- libstdc++-v3/src/c++17/fs_ops.cc | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc index 1a340477b3a..008195c2d31 100644 --- a/libstdc++-v3/src/c++17/fs_ops.cc +++ b/libstdc++-v3/src/c++17/fs_ops.cc @@ -65,19 +65,12 @@ namespace posix = std::filesystem::__gnu_posix; fs::path fs::absolute(const path& p) { -#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS error_code ec; path ret = absolute(p, ec); if (ec) _GLIBCXX_THROW_OR_ABORT(filesystem_error("cannot make absolute path", p, ec)); return ret; -#else - if (p.empty()) - _GLIBCXX_THROW_OR_ABORT(filesystem_error("cannot make absolute path", p, - make_error_code(std::errc::invalid_argument))); - return current_path() / p; -#endif } fs::path