From patchwork Sat Nov 11 00:58:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 164051 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp456vqg; Fri, 10 Nov 2023 18:10:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IEAeMWT96qjhGbGUrNeztTTp3EWUF+gNx9Sxgc7axH2walVWNINTWlXCnFX1AtxLR9QmX3G X-Received: by 2002:a05:620a:84c9:b0:771:31c:adcb with SMTP id pq9-20020a05620a84c900b00771031cadcbmr1088942qkn.7.1699668624118; Fri, 10 Nov 2023 18:10:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1699668624; cv=pass; d=google.com; s=arc-20160816; b=VZtqY6/nSY/4bqgIAZogih0Hr4vRWeiaXfsREozJ7xu8CnMjXwSeJ/hxo08f9xUE7W pBd8wHr2Y2eNK4kwVJX1OsT0OpEBu+nqg8BnpDfFHSq8lYdzz3BuFi9Vv0iKgEMcdVq6 VP+WQ7z/iHuQQ4eBsqnIfR5pQPE6wL4KP1iPVxZGR8Y978pfJ5u8vQ+8njV53eL18hVp g1hJoah9SqMI0Wjr8QusRNi6k9lIzAOV2zAHZT0dLCkvkyrhgJE7krCN7NjFHfH7AWRm SlzGAnKnX79Z5J/JiiapFl7Hur0XEb7Gy+TuHIzZ8jqPAYO867MIA/RiRUTQvpW2o4ED J6XA== 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=zrZpgxmHLwslPrhCyWo5SxQl2+B/npjDZijpz/k2oZ0=; fh=sJ+2/4g29YdyXkoRrFZSpsL2zxijepB7X/1rB0LDDh8=; b=PqtHQ5+GHTPS5ofa2cm7wv2AcaUfXUo4xUaWhua9oki2RiB/Jk4DrgIMVGI/dYEMV4 cafZn9BUxxwkwmzOgYU0/ElZByQ5Rn82CdadrEcB2AVTl4vK8pE37aK8USGvEeCStqXo JlzRpoZamblgjrCxy5XUvdIiG0qeJztWcLE7vrrKdFuq5Q8v/v0GFZRCHEfqTpAitGd9 sIhsVKEcGZJOAp6JbSoaD9LfHrmMVgEMYgaRZKqRSP/cl7PQrsOTODJ+oyBYN+TgkKvI iggSvFtvXjn4xYzaIwhaAqBokUnDOOSOWbWJKF7IoB/F32Lbtnif/ZROiwr2sk95pvvZ gm0g== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=gSay3cdi; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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. [8.43.85.97]) by mx.google.com with ESMTPS id i16-20020a05620a405000b0076caee4b64esi738711qko.262.2023.11.10.18.10.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 18:10:24 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=gSay3cdi; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 ED608385B534 for ; Sat, 11 Nov 2023 00:59:04 +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 A2B883858C39 for ; Sat, 11 Nov 2023 00:58:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A2B883858C39 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 A2B883858C39 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=1699664319; cv=none; b=X5fwbkcN8O+5gX/12ZqtWTGXiZEQMFnW/tIosmf8jMeKPb2KyAopxwayEGyHKRNMpNtk2qy7coYvODbkmL1vjY+xViqs0NjB7OemEpQyzsi2tu+CKyxOGrAqsyHU4ZhUu2iWaEorgrTm20lPj0j5QYO+HdoQqcNygu6EuPUTAEU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699664319; c=relaxed/simple; bh=w8u8FDzcPwTtZXqsfZleozes/6qAud3paptZHe4/Wys=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=YrWwIZ16qTeObQYEeZCJ5QO3NeLIoxGbLFFBttovQACN0Ou6P/4v9aoFhITPm6CutY9dMdDQ1svIP89dDa5hkn2HQGk5iw1H42mKRcLlNjEX9wzGtFVX1Xc/tzVX8o4YmL4KqIGHL9C8qZ5dDUVg9Ou70i3gFV4MwfW9xXX8kTw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699664317; 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=zrZpgxmHLwslPrhCyWo5SxQl2+B/npjDZijpz/k2oZ0=; b=gSay3cdiP0uW/mQVIMXC4Xb9b5ekeuTdREAUXwht7vwq9srQombO+Kq/GrKhG1bZIQOTYc xb90q77QzeHn8Cjjth2JiC7ZwRypr00EoTZ5ffmc2X5uReUm1Ecz8TrtYKRUPbS89Pq+M2 mkXdXRdIxbRDcBN+BPd7xbreeiycdPQ= 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-344-E7BNGVdTMe-k5tVbCNC2xQ-1; Fri, 10 Nov 2023 19:58:35 -0500 X-MC-Unique: E7BNGVdTMe-k5tVbCNC2xQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 A18568007B3; Sat, 11 Nov 2023 00:58:35 +0000 (UTC) Received: from localhost (unknown [10.42.28.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6BD301C060AE; Sat, 11 Nov 2023 00:58:35 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Do not use assume attribute for Clang [PR112467] Date: Sat, 11 Nov 2023 00:58:14 +0000 Message-ID: <20231111005834.93376-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.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_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782231726999655599 X-GMAIL-MSGID: 1782231726999655599 Tested x86_64-linux (-m32 and -m64). Pushed to trunk. -- >8 -- Clang has an 'assume' attribute, but it's a function attribute not a statement attribute. The recently-added use of the statement form causes an error with Clang. libstdc++-v3/ChangeLog: PR libstdc++/112467 * include/bits/stl_bvector.h (_M_assume_normalized): Do not use statement form of assume attribute for Clang. --- libstdc++-v3/include/bits/stl_bvector.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index 2b91af2005f..64f04c1f4f5 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -185,8 +185,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER void _M_assume_normalized() const { +#if __has_attribute(__assume__) && !defined(__clang__) unsigned int __ofst = _M_offset; __attribute__ ((__assume__ (__ofst < unsigned(_S_word_bit)))); +#endif } _GLIBCXX20_CONSTEXPR