From patchwork Wed Aug 8 13:08:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 955061 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-483382-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="nIZTFywN"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41lsCG5879z9s3Z for ; Wed, 8 Aug 2018 23:08:42 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=dPF5ceGS+iSx0XZjyHQid/QJvclHFAwMscE6XC8E0QxTWxhfSAiQQ lVff4L+QKqJ7kgs0i2ZK6JBscWTNR3mSBf+3QtNtlHIFfYkPYERmKRdayGLuN4pX z334a/05H17xtQjJ1An+uIltoHR7Sadb3KPQtNSNw9y/3HDrbJ5Osk= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=Wx4+Dq7v/MFngP5Z87JfiippRy4=; b=nIZTFywNc0GlxiG9qpEY WKIdK0fey8mp7/NgM3Ymbo3LA16MfonQ0y7jYG+xxKNKRC1Tldid0X+TgbtTir9l Ufev2F8KKx/MGqJZNVl82S6rj2b9vMXLDBXKgcxkUriITi3M7ysh3s4Xs3uN/UQo AiAU65GCpX3+rs/Cw2bINA4= Received: (qmail 92453 invoked by alias); 8 Aug 2018 13:08:19 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 92333 invoked by uid 89); 8 Aug 2018 13:08:18 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=observers X-HELO: mx1.redhat.com Received: from mx3-rdu2.redhat.com (HELO mx1.redhat.com) (66.187.233.73) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 08 Aug 2018 13:08:15 +0000 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A4AFE40241CB; Wed, 8 Aug 2018 13:08:13 +0000 (UTC) Received: from localhost (unknown [10.33.36.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 652BA1C734; Wed, 8 Aug 2018 13:08:13 +0000 (UTC) Date: Wed, 8 Aug 2018 14:08:12 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH] PR libstdc++/86597 directory_entry observers should clear error_code Message-ID: <20180808130812.GA25812@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.9.2 (2017-12-15) PR libstdc++/86597 * include/bits/fs_dir.h (directory_entry::_M_file_type(error_code&)): Clear error_code when cached type is used. * testsuite/27_io/filesystem/directory_entry/86597.cc: New test. Committed to trunk, gcc-8 backport to follow. commit 5849d364a0f81686e70b2a277bf2517fdd1bc968 Author: Jonathan Wakely Date: Wed Aug 8 13:46:06 2018 +0100 PR libstdc++/86597 directory_entry observers should clear error_code PR libstdc++/86597 * include/bits/fs_dir.h (directory_entry::_M_file_type(error_code&)): Clear error_code when cached type is used. * testsuite/27_io/filesystem/directory_entry/86597.cc: New test. diff --git a/libstdc++-v3/include/bits/fs_dir.h b/libstdc++-v3/include/bits/fs_dir.h index cf7a3c29376..9ee1cb66b61 100644 --- a/libstdc++-v3/include/bits/fs_dir.h +++ b/libstdc++-v3/include/bits/fs_dir.h @@ -318,7 +318,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 _M_file_type(error_code& __ec) const noexcept { if (_M_type != file_type::none && _M_type != file_type::symlink) - return _M_type; + { + __ec.clear(); + return _M_type; + } return status(__ec).type(); } diff --git a/libstdc++-v3/testsuite/27_io/filesystem/directory_entry/86597.cc b/libstdc++-v3/testsuite/27_io/filesystem/directory_entry/86597.cc new file mode 100644 index 00000000000..3b2acbe5842 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/filesystem/directory_entry/86597.cc @@ -0,0 +1,52 @@ +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17 -lstdc++fs" } +// { dg-do run { target c++17 } } +// { dg-require-filesystem-ts "" } + +#include +#include +#include + +// PR libstdc++/86597 + +void +test01() +{ + const auto bad_ec = make_error_code(std::errc::address_in_use); + std::error_code ec; + std::filesystem::directory_entry ent("."); + + ec = bad_ec; + VERIFY( ent.exists(ec) ); + VERIFY( !ec ); + + ec = bad_ec; + VERIFY( ent.is_directory(ec) ); + VERIFY( !ec ); + + ec = bad_ec; + VERIFY( !ent.is_regular_file(ec) ); + VERIFY( !ec ); +} + +int +main() +{ + test01(); +}