From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 5C2193857423 for ; Sat, 28 Aug 2021 12:15:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5C2193857423 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-403-IYK-oYiJNVCiT9r1YcUJTg-1; Sat, 28 Aug 2021 08:15:15 -0400 X-MC-Unique: IYK-oYiJNVCiT9r1YcUJTg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 007131853029; Sat, 28 Aug 2021 12:15:15 +0000 (UTC) Received: from localhost (unknown [10.33.36.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 83F8A90BD; Sat, 28 Aug 2021 12:15:14 +0000 (UTC) Date: Sat, 28 Aug 2021 13:15:13 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix inefficiency in filesystem::absolute [PR99876] Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="b4gwcjAVnjVbTR+R" Content-Disposition: inline X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Aug 2021 12:15:19 -0000 --b4gwcjAVnjVbTR+R Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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. Tested powerpc64le-linux. Committed to trunk. I'll backport to gcc-10 and gcc-11 too. --b4gwcjAVnjVbTR+R Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit 07b990ee23e0c7a92d362dbb25fd5d57d95eb8be Author: Jonathan Wakely Date: Fri Aug 27 10:59:54 2021 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. diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc index 0e2d952673f..2eac9977785 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 --b4gwcjAVnjVbTR+R--