From patchwork Fri Oct 15 23:49:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 46298 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E6E4C3858401 for ; Fri, 15 Oct 2021 23:51:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E6E4C3858401 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1634341872; bh=lrOfMsbjpLTkwjgXNftphFRPknhRVxb2XmsTHN6/Z7Q=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=W8ZaWxDHXY9wONuxidIBTMpIcZ4kP1bEbWXvUZ6Aqh6ZDa2nFsNScAoKDRvJwb4q3 oseBYfpRNO617FUgfde9/ckSS3E0hPrgwbj+n387rMFmcSVayUdb+EucyYSyD3vJzE kIZRAUiBFAWBh9F/QUaTZJXDRQPFU0aI4vQMO9eU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 C00463857825 for ; Fri, 15 Oct 2021 23:49:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C00463857825 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-409-p0W6NMCrN3Sup9-NeHk0ig-1; Fri, 15 Oct 2021 19:49:04 -0400 X-MC-Unique: p0W6NMCrN3Sup9-NeHk0ig-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 14CCB18125C1; Fri, 15 Oct 2021 23:49:03 +0000 (UTC) Received: from localhost (unknown [10.33.36.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id B38F360C21; Fri, 15 Oct 2021 23:49:02 +0000 (UTC) Date: Sat, 16 Oct 2021 00:49:01 +0100 To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix error in filesystem::path with Clang Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-13.8 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=unavailable autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" THis fixes teh following error seen with Clang: error: function '_S_convert>' with deduced return type cannot be used before it is defined return string_type(_S_convert(std::u8string_view(__str))); ^ libstdc++-v3/ChangeLog: * include/bits/fs_path.h (path::_S_convert(T)): Avoid recursive call to function with deduced return type. Tested powerpc64le-linux. Committed to trunk. commit e547d1341b1fe90672c9b982c4a98f8197237bb7 Author: Jonathan Wakely Date: Fri Oct 15 23:27:54 2021 libstdc++: Fix error in filesystem::path with Clang THis fixes teh following error seen with Clang: error: function '_S_convert>' with deduced return type cannot be used before it is defined return string_type(_S_convert(std::u8string_view(__str))); ^ libstdc++-v3/ChangeLog: * include/bits/fs_path.h (path::_S_convert(T)): Avoid recursive call to function with deduced return type. diff --git a/libstdc++-v3/include/bits/fs_path.h b/libstdc++-v3/include/bits/fs_path.h index d13fb12455c..4bd980952f1 100644 --- a/libstdc++-v3/include/bits/fs_path.h +++ b/libstdc++-v3/include/bits/fs_path.h @@ -630,7 +630,8 @@ namespace __detail // Calling _S_convert will return a u8string_view that // refers to __str and would dangle after this function returns. // Return a string_type instead, to avoid dangling. - return string_type(_S_convert(std::u8string_view(__str))); + return string_type(_S_convert(__str.data(), + __str.data() + __str.size())); #endif else return _S_convert(__str.data(), __str.data() + __str.size());