From patchwork Thu Aug 1 21:32:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1968050 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=MYffuZHd; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WZj7q3H3Cz1yZl for ; Fri, 2 Aug 2024 07:40:55 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B5886385F028 for ; Thu, 1 Aug 2024 21:40:53 +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.129.124]) by sourceware.org (Postfix) with ESMTP id 15DC03858D39 for ; Thu, 1 Aug 2024 21:39:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 15DC03858D39 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 15DC03858D39 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722548379; cv=none; b=Y4l72+w3KMySFKTRqF0/XSPNHqm1meDAdgR2xBMO6L1vMFnvBPoStQY03kIhrvlE1aTRA7HxpZLAy8e1Mh5A1VCnvQeV7F5fRL1e7iw9IcI59cLHiIW7kcaKTKBgwc/KNcOtRxBym06AZhJvOhX4rN3FdW7X/V24NJInPkZmoBg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722548379; c=relaxed/simple; bh=NkJadp62vDBdtNfAtbSbLTbQnipquC1uzlTtL8wFcoM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=eEqh2LVTTT/fASu2MV+FHVklo2xY1dWgP35/rFxER0mPcLhfVmRbsKM7+9kGLw7qAKLfr4ojH2QLdLTXegz3PaZv527DRrSeR8yIYj7xXTg0QtBwUNYNPIeglX4K8Lmgp08b1c+IwYpSlI4vHSu/kSRcFQp9HWdEC+jzCMjtQjc= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722548377; 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=QhAErLiiS52BPS1mpytHs2L7v9zyrJXxA2tHyDiYmog=; b=MYffuZHdEpc8EbrdP54Rdt1IfqCCoR4dA0KK1NmOFCpM6vLuUDHhRqOhdhmxaF8zXMKZx4 cJsWnHALh4qARXosCfOhHCpN+liyiOk33LlSo2aHTs+CH/F7eiyzjzROpvEpyD7sPDzrJZ RYekXOmQQ8fHjGv9R7mEvYFcUe9PGBw= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-411-LlSqJihwMeGe6dhcD4hI8A-1; Thu, 01 Aug 2024 17:39:36 -0400 X-MC-Unique: LlSqJihwMeGe6dhcD4hI8A-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8B83C1955D47; Thu, 1 Aug 2024 21:39:35 +0000 (UTC) Received: from localhost (unknown [10.42.28.21]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DBEFC195605A; Thu, 1 Aug 2024 21:39:34 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH] libstdc++: Use strlen for std::char_traits::length [PR102958] Date: Thu, 1 Aug 2024 22:32:28 +0100 Message-ID: <20240801213927.388966-3-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.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 autolearn=ham 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~incoming=patchwork.ozlabs.org@gcc.gnu.org Tested x86_64-linux. -- >8 -- libstdc++-v3/ChangeLog: PR tree-optimization/102958 * include/bits/char_traits.h (char_traits::length): Use strlen. --- libstdc++-v3/include/bits/char_traits.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h index 3074e9bb77e..ac3e43e34b9 100644 --- a/libstdc++-v3/include/bits/char_traits.h +++ b/libstdc++-v3/include/bits/char_traits.h @@ -651,10 +651,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if (std::__is_constant_evaluated()) return __gnu_cxx::char_traits::length(__s); #endif - size_t __i = 0; - while (!eq(__s[__i], char_type())) - ++__i; - return __i; + return __builtin_strlen((const char*)__s); } static _GLIBCXX17_CONSTEXPR const char_type*