From patchwork Wed Jun 28 21:36:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 1801295 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.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=m03rn53P; dkim-atps=neutral Received: from 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qrvzx1RYKz20ZC for ; Thu, 29 Jun 2023 07:37:01 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AB60C3858C66 for ; Wed, 28 Jun 2023 21:36:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AB60C3858C66 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1687988218; bh=UM2uxmQDqIgsBfj7m46GtcdCexyVqCmaYG6Ve4W1w8o=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=m03rn53PmhRbv7hDxRCtpdJKMErwMmi/dZHpSYapE2+FQSIQ7d7NN2EPBdw7NpJEb JkYabCMrgHorZ+QnN4tIuSp+ORf2xU6rmT42L+M2W/FeklNZCDKJmnVWvNDLVd1JNi mbs1eD3rwC8p344HNWqBQdHplN55IdMH0Wqk9jYI= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by sourceware.org (Postfix) with ESMTP id 8616E3858D35 for ; Wed, 28 Jun 2023 21:36:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8616E3858D35 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C00DAC14 for ; Wed, 28 Jun 2023 14:37:21 -0700 (PDT) Received: from localhost (e121540-lin.manchester.arm.com [10.32.110.72]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BE0333F663 for ; Wed, 28 Jun 2023 14:36:37 -0700 (PDT) To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, richard.sandiford@arm.com Subject: [PATCH] A couple of va_gc_atomic tweaks Date: Wed, 28 Jun 2023 22:36:36 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Spam-Status: No, score=-27.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Sandiford via Gcc-patches From: Richard Sandiford Reply-To: Richard Sandiford Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" The only current user of va_gc_atomic is Ada's: vec It uses the generic gt_pch_nx routines (with gt_pch_nx being the “note pointers” hooks), such as: template void gt_pch_nx (vec *v) { extern void gt_pch_nx (T &); for (unsigned i = 0; i < v->length (); i++) gt_pch_nx ((*v)[i]); } It then defines gt_pch_nx routines for Entity_Id &. The problem is that if we wanted to take the same approach for an array of unsigned ints, we'd need to define: inline void gt_pch_nx (unsigned int &) { } which would then be ambiguous with: inline void gt_pch_nx (unsigned int) { } The point of va_gc_atomic is that the elements don't need to be GCed, and so we have: template void gt_ggc_mx (vec *v ATTRIBUTE_UNUSED) { /* Nothing to do. Vectors of atomic types wrt GC do not need to be traversed. */ } I think it's therefore reasonable to assume that no pointers will need to be processed for PCH either. The patch also relaxes the array_slice constructor for vec * so that it handles all embedded vectors. Bootstrapped & regression-tested on aarch64-linux-gnu (all languages). OK to install? Richard gcc/ * vec.h (gt_pch_nx): Add overloads for va_gc_atomic. (array_slice): Relax va_gc constructor to handle all vectors with a vl_embed layout. gcc/ada/ * gcc-interface/decl.cc (gt_pch_nx): Remove overloads for Entity_Id. --- gcc/ada/gcc-interface/decl.cc | 11 ----------- gcc/vec.h | 22 ++++++++++++++++++---- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/gcc/ada/gcc-interface/decl.cc b/gcc/ada/gcc-interface/decl.cc index 494b24e2111..ee913a017d2 100644 --- a/gcc/ada/gcc-interface/decl.cc +++ b/gcc/ada/gcc-interface/decl.cc @@ -163,17 +163,6 @@ struct GTY((for_user)) tree_entity_vec_map vec *to; }; -void -gt_pch_nx (Entity_Id &) -{ -} - -void -gt_pch_nx (Entity_Id *x, gt_pointer_operator op, void *cookie) -{ - op (x, NULL, cookie); -} - struct dummy_type_hasher : ggc_cache_ptr_hash { static inline hashval_t diff --git a/gcc/vec.h b/gcc/vec.h index 36918915701..6f7b0487eb6 100644 --- a/gcc/vec.h +++ b/gcc/vec.h @@ -1390,6 +1390,13 @@ gt_pch_nx (vec *v) gt_pch_nx ((*v)[i]); } +template +void +gt_pch_nx (vec *) +{ + /* No pointers to note. */ +} + template void gt_pch_nx (vec *v, gt_pointer_operator op, void *cookie) @@ -1407,6 +1414,13 @@ gt_pch_nx (vec *v, gt_pointer_operator op, void *cookie) gt_pch_nx (&((*v)[i]), op, cookie); } +template +void +gt_pch_nx (vec *, gt_pointer_operator, void *) +{ + /* No pointers to note. */ +} + /* Space efficient vector. These vectors can grow dynamically and are allocated together with their control data. They are suited to be @@ -2286,12 +2300,12 @@ public: array_slice (vec &v) : m_base (v.address ()), m_size (v.length ()) {} - template - array_slice (const vec *v) + template + array_slice (const vec *v) : m_base (v ? v->address () : nullptr), m_size (v ? v->length () : 0) {} - template - array_slice (vec *v) + template + array_slice (vec *v) : m_base (v ? v->address () : nullptr), m_size (v ? v->length () : 0) {} iterator begin () { return m_base; }