From patchwork Fri Jan 19 19:13:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 189657 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp1225491dyb; Fri, 19 Jan 2024 11:14:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IEQHML5BHyuXJs6BcwQDBXwt2NLRLgjiOxa7rUgvShCixIt7Y0ClQXLn1ulxTjDy0L9f04l X-Received: by 2002:ac8:4e8a:0:b0:429:fef2:1f1b with SMTP id 10-20020ac84e8a000000b00429fef21f1bmr374489qtp.94.1705691686263; Fri, 19 Jan 2024 11:14:46 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705691686; cv=pass; d=google.com; s=arc-20160816; b=a5htMgCWabsTiv79kinnUcS7eKxC8tv2kx3Mfp4yRPuhTK0/XVhlgr5DeKW+PKoKKE hKuNDt3j+HomZ3SSfaahT8uX/GAMC9PXhQvUymShm2mo8i1uQPWhDCDlKbRMc9+oo5zD 07zIB3VGbU9rsl3OYvEWQWUQcf+oc4/FXEpPqxHLntnJFZuHZrUKBbh2H2TnEk/0f85w jlH6w17G6iII4wBmnAbWHPLQE6B7pCrdXgmuKBexo4Pe1vLc5fEG3sCq9w0KLexhrohj xLcTKaTeqdxYB1t8LV+wkc2MXHTyINe/f1kBpt09uqjPVM+xwz9nX1LKH3ufTIwAlARr vsSA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=El0H59yAHjVCQZGzC/vCptL2ARBVuJm380p+xRFtZWM=; fh=sJ+2/4g29YdyXkoRrFZSpsL2zxijepB7X/1rB0LDDh8=; b=rRarfd7p5aC9wVLf/R25uqGZWAyzYVPuA5gpLTX52vVbN9Tf4k9eHB+QRMDWNFaT28 V9U03Jks8xxSv4RJWTLc44SMFsNFyx7UVzH3Fu9I6l/zYMgXydVBFL6/osMjuPUME2Sk ArmDUztBRkWm1Tx+WIoehp4efeJWrP8zwfrd5IsSQCbEZVDx3lO4H1apvapENDtzxvU6 SKVbAWNM6zMdMj1IQ+0r4mNO1HyuXde+W6Y84qUWH+W/Il5yRUY006PsnwTUOD0cGkiX /8YDm6pCmrI2uya4g74Hcl1vzc2hVrAtXwKEP96ac9DOAoxqomxrzG9JZ8hsvlatqi0v m4uA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=E292cjgW; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id j11-20020ac85c4b000000b0042a12eaf784si5704451qtj.80.2024.01.19.11.14.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jan 2024 11:14:46 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=E292cjgW; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E2DA13857C4F for ; Fri, 19 Jan 2024 19:14:45 +0000 (GMT) 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 [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 2C8F63858418 for ; Fri, 19 Jan 2024 19:13:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2C8F63858418 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2C8F63858418 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705691641; cv=none; b=tbOOUPP17aR471Fnc0LIZGaIs48lI4HagE/35sIYSe5+Qv2bhbPC6ayBva0RaZnskFs9pYn7eNyRmzuPhbT/vG6ZjOKU6UCnPlNNA3vF1Xs7mmrCb578Ui9vEj9zQKeQFDlmdlcd3252MynttVuuENDmHjp4JxLqUTWyDB833a4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705691641; c=relaxed/simple; bh=3TPDx119VsAGmHo+pgg1EPHKXgUUuXWt6/fmrjIlpMg=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=tk2I3qN5aPf7AG48CFVoNmLHHvM5+v5fdVuu6UpC3zgUhOfsSoSKoJBQsBz3CKCWdcdY0pHw29IYbDd+LLuAllSVQ3Tu7IhVuPwY41RdSNOxOf7RQs0oPbdbG9hzKi+XWaHHudU7sE6Zj8t7CTdxEd9x7DltZCb0R2b8VEcyxU4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705691637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=El0H59yAHjVCQZGzC/vCptL2ARBVuJm380p+xRFtZWM=; b=E292cjgWWixH2VyDWqsy9sG/7EPyJms3/aib6hj6kyEbjYm6h/hVf5p0xZT9Vjexhh65tc Mf7XtLQKYjVvTsEI0sgSXnCaFJUcBz2tqgr3BJFnyxP7BelOnFTmy1zdaRkxpd9M4hITJP aIsYSUCC0FrHLldcopXYg+kc6Pnwrh0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-12-HKFAAlemPy64q19pmveyog-1; Fri, 19 Jan 2024 14:13:54 -0500 X-MC-Unique: HKFAAlemPy64q19pmveyog-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F0C80101A526; Fri, 19 Jan 2024 19:13:53 +0000 (UTC) Received: from localhost (unknown [10.42.28.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC0192166B33; Fri, 19 Jan 2024 19:13:53 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Do not use CTAD for _Utf32_view alias template (redux) Date: Fri, 19 Jan 2024 19:13:48 +0000 Message-ID: <20240119191353.269510-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.1 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_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788547365569517137 X-GMAIL-MSGID: 1788547365569517137 Tested powerp64le-linux. Pushed to trunk. -- >8 -- My change in r14-8181-g665a3ff1539ce2 was incomplete as there's a second place using CTAD with the _Utf32_view alias template. This fixes it. libstdc++-v3/ChangeLog: * include/std/format (_Spec::_M_parse_fill_and_align): Do not use CTAD for _Utf32_view. --- libstdc++-v3/include/std/format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index efc4a17ba36..f4d91517656 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -434,7 +434,7 @@ namespace __format if constexpr (__literal_encoding_is_unicode<_CharT>()) { // Accept any UCS scalar value as fill character. - _Utf32_view __uv(ranges::subrange(__first, __last)); + _Utf32_view> __uv({__first, __last}); if (!__uv.empty()) { auto __beg = __uv.begin();