From patchwork Mon Oct 16 23:02:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 77905 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 BABF03857012 for ; Mon, 16 Oct 2023 23:06:04 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta036.useast.a.cloudfilter.net (omta036.useast.a.cloudfilter.net [44.202.169.35]) by sourceware.org (Postfix) with ESMTPS id 248763858C54 for ; Mon, 16 Oct 2023 23:05:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 248763858C54 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 248763858C54 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.35 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697497532; cv=none; b=I4YzcWSs3BJ8BXQlEkvQJLRKh1Nn+Vqa70EtyG5r3Hi3al1JV40rQyrDRO9cxkDGBxtpHUkz6nZydDlUALL06MOX/hZuA2c0mtDqvJ0tIv4T7yyVR5wTEmJ5+eyLRxYMqQSCP5roSvORtQVlfkvg45HbeyRTM5Ee0LV6w7fq9bM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697497532; c=relaxed/simple; bh=ZYVYfrxqtUCs8XAxIhDo672ZiqnpskFYJTYSAVOyzic=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=WfPjS0XaFJ7fWLmiU1hodzhZa+gW5EZn57M7cQ2uPlOMXM1UD5wAfLMwCVFFkJj9rOGVMWYO6j0GES0+4lQbgxQhdJGk21W63KsseCE8Xoqta2rUVxkEbob1DCjcH1v2u/8eVhvmrbseERkKVJda/EJXHwqJCTVVgxfXoY2gKmI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6004a.ext.cloudfilter.net ([10.0.30.197]) by cmsmtp with ESMTPS id sWRBqaCKzOFScsWeQqX1LT; Mon, 16 Oct 2023 23:05:30 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id sWePqy1EorT4CsWePqzJOD; Mon, 16 Oct 2023 23:05:29 +0000 X-Authority-Analysis: v=2.4 cv=f/hbuc+M c=1 sm=1 tr=0 ts=652dc1b9 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=bhdUkHdE2iEA:10 a=Qbun_eYptAEA:10 a=6K-99XNBvaN-ywHE-TcA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=JsQd8qARsoeV5nEFGhutAqOP16RDGjrB/kyGO1ZOyYM=; b=BhGatsspi2LGobIGNo7XOHpBdz SNH4s5dfpiMW25d+i9qDA67L3MdFjm8M3M5l75MTWraReKH+RUNl2cdv5aqoFVONQF+ZBTqIILQIg /wBrrgUfn70NHZv8NMR0Vu1sm; Received: from [161.98.8.3] (port=38490 helo=prentzel.ci.boulder.co.us) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.1) (envelope-from ) id 1qsWeP-003Maa-0L; Mon, 16 Oct 2023 17:05:29 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 3/7] Enable some C++14 code in array-view.h Date: Mon, 16 Oct 2023 17:02:42 -0600 Message-ID: <20231016230527.1820819-4-tom@tromey.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231016230527.1820819-1-tom@tromey.com> References: <20231016230527.1820819-1-tom@tromey.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 161.98.8.3 X-Source-L: No X-Exim-ID: 1qsWeP-003Maa-0L X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (prentzel.ci.boulder.co.us) [161.98.8.3]:38490 X-Source-Auth: tom+tromey.com X-Email-Count: 4 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfCMZMeLcJXsHnguSUz/bpozvxBnojpC095nmLDurD6Bhd1EFSr9rbnKQuQMB05oZnXEluRbBNBh0ONhGYKKp4tjiIKtBuFSQz0Wp0lvgNKjk7ZNAVYNj loPjr6aeZWfKGaUXXygtMFxM3NCSek1qapjzwxIjZnr/PlceAzgf3c20mub2N2HphAq7/d/3PG5gUh/p6mJNodgla5ofiyksUBA= X-Spam-Status: No, score=-3024.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org This changes gdbsupport/array-view.h to enable some code that is C++14-specific. --- gdbsupport/array-view.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/gdbsupport/array-view.h b/gdbsupport/array-view.h index ee3a3c58710..d58b99fb647 100644 --- a/gdbsupport/array-view.h +++ b/gdbsupport/array-view.h @@ -153,18 +153,17 @@ class array_view : m_array (c.data ()), m_size (c.size ()) {} - /* Observer methods. Some of these can't be constexpr until we - require C++14. */ - /*constexpr14*/ T *data () noexcept { return m_array; } + /* Observer methods. */ + constexpr T *data () noexcept { return m_array; } constexpr const T *data () const noexcept { return m_array; } - /*constexpr14*/ T *begin () noexcept { return m_array; } + constexpr T *begin () noexcept { return m_array; } constexpr const T *begin () const noexcept { return m_array; } - /*constexpr14*/ T *end () noexcept { return m_array + m_size; } + constexpr T *end () noexcept { return m_array + m_size; } constexpr const T *end () const noexcept { return m_array + m_size; } - /*constexpr14*/ reference operator[] (size_t index) noexcept + constexpr reference operator[] (size_t index) noexcept { #if defined(_GLIBCXX_DEBUG) gdb_assert (index < m_size); @@ -173,7 +172,7 @@ class array_view } constexpr const_reference operator[] (size_t index) const noexcept { -#if defined(_GLIBCXX_DEBUG) && __cplusplus >= 201402L +#if defined(_GLIBCXX_DEBUG) gdb_assert (index < m_size); #endif return m_array[index]; @@ -187,7 +186,7 @@ class array_view /* Return a new array view over SIZE elements starting at START. */ constexpr array_view slice (size_type start, size_type size) const noexcept { -#if defined(_GLIBCXX_DEBUG) && __cplusplus >= 201402L +#if defined(_GLIBCXX_DEBUG) gdb_assert (start + size <= m_size); #endif return {m_array + start, size}; @@ -197,7 +196,7 @@ class array_view inclusive. */ constexpr array_view slice (size_type start) const noexcept { -#if defined(_GLIBCXX_DEBUG) && __cplusplus >= 201402L +#if defined(_GLIBCXX_DEBUG) gdb_assert (start <= m_size); #endif return {m_array + start, size () - start};