From patchwork Wed Apr 28 11:56:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1471107 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=nr37BWIi; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FVcYB5ytqz9sSC for ; Wed, 28 Apr 2021 21:56:30 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0ECE93A77063; Wed, 28 Apr 2021 11:56:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0ECE93A77063 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1619610988; bh=MpDm+lKlfzM8/oc800zxrqrxFkdeLcuZHs5lOUG0H3I=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=nr37BWIiTPQ2YOM0Flt0H80XCvtBWvKnhc979Z7Mv1+xTWsNvKaQb5M1+a3sikyjy 7FLgEsMGK7/izxCVmbGWDsRlrK3oKURxWaCB22P1BpjCHvRW36xv3krH2LqZjDvbFa HXVkbOy+ItgnGqUO85fYoEkaLrpwB9HWPj9A4GIc= 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 78B723A7704C for ; Wed, 28 Apr 2021 11:56:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 78B723A7704C 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-45-pPzhMd-iMMmBDuLpjrNl-A-1; Wed, 28 Apr 2021 07:56:22 -0400 X-MC-Unique: pPzhMd-iMMmBDuLpjrNl-A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 941B76D587; Wed, 28 Apr 2021 11:56:21 +0000 (UTC) Received: from localhost (unknown [10.33.36.164]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4452860C05; Wed, 28 Apr 2021 11:56:21 +0000 (UTC) Date: Wed, 28 Apr 2021 12:56:20 +0100 To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Add missing noexcept on std::thread member function [PR 100298] Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-14.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_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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@gcc.gnu.org Sender: "Gcc-patches" The new inline definition of std::thread::hardware_concurrency() for non-gthreads targets is missing the noexcept-specifier that is on the declaration. libstdc++-v3/ChangeLog: PR libstdc++/100298 * include/bits/std_thread.h (thread::hardware_concurrency): Add missing noexcept to inline definition for non-gthreads targets. Tested x86_64-linux. Committed to trunk, about to backport to gcc-11. commit 5cc28000cfcc219fb4c45dbc5388ec05109049af Author: Jonathan Wakely Date: Wed Apr 28 12:45:49 2021 libstdc++: Add missing noexcept on std::thread member function [PR 100298] The new inline definition of std::thread::hardware_concurrency() for non-gthreads targets is missing the noexcept-specifier that is on the declaration. libstdc++-v3/ChangeLog: PR libstdc++/100298 * include/bits/std_thread.h (thread::hardware_concurrency): Add missing noexcept to inline definition for non-gthreads targets. diff --git a/libstdc++-v3/include/bits/std_thread.h b/libstdc++-v3/include/bits/std_thread.h index 70cb31a5331..2a500bf1777 100644 --- a/libstdc++-v3/include/bits/std_thread.h +++ b/libstdc++-v3/include/bits/std_thread.h @@ -270,7 +270,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #ifndef _GLIBCXX_HAS_GTHREADS inline void thread::join() { std::__throw_system_error(EINVAL); } inline void thread::detach() { std::__throw_system_error(EINVAL); } - inline unsigned int thread::hardware_concurrency() { return 0; } + inline unsigned int thread::hardware_concurrency() noexcept { return 0; } #endif inline void