From patchwork Thu Aug 1 14:56:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 1967761 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=embecosm.com header.i=@embecosm.com header.a=rsa-sha256 header.s=google header.b=LIw5GkGm; 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 4WZXbJ6gpYz1yZv for ; Fri, 2 Aug 2024 01:15:40 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 339C5384AB53 for ; Thu, 1 Aug 2024 15:15:39 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by sourceware.org (Postfix) with ESMTPS id B021C385E839 for ; Thu, 1 Aug 2024 14:59:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B021C385E839 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B021C385E839 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::62b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722524389; cv=none; b=JAmVEJyDRNpTBGHevQNCmfBbibqTEici6/mQDNtCXil6nC+7xG8tq6PzwhXIqwTtrJi0SbEPYuMj/jKZ+NzmN1QQ521q5ypehI6xnI4ETvLn7F7lqn6bul+h22nOAkuFavgUntsqQO8nNwkFNKtAhUYDkpvYRktGisPsbKruvME= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722524389; c=relaxed/simple; bh=ng02JeaVnAuE3Ci6I20jfKl231vZoJOlqJ2lgap/a/0=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=dv8JQ2y8toDONshaHskU84CKlaLAsoh8BFWv8WWds/w2fRYHYfRz/PBQ/gO+cjra2zzE5Dq22avhaFzDpHnnN+ic2K4Xr7NrKKXyIzL04kN+w2NfiEB3xwjpU/s7IRLYGSIJGJ6sFzIMlj1ow0vL92Pw+4aphwzyY9ZynhdQlDU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-a7aaa77fac4so298339066b.0 for ; Thu, 01 Aug 2024 07:59:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1722524355; x=1723129155; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NK+uFI5fgUQKpe3JtD5QhhSQyBa6XEcy07C8Ppj6XAQ=; b=LIw5GkGmU5Yotr7KnEIFbLmuYfNpKJkNPMqA3Vjnw4XyKAuIgFEZrA0JXDYsWJNaMf 77B8iyFiyZRI1IdkHTp27xDiGe6qLrLtHrCfS6BvuzsKsd83651uC50f3wYU6wHx0dih Bn7HxkoAEub5g5rstYoW3ipn5GyHD8418uU0NgZPgrSgjFSTDNjji3z6y1lAXCfav2zZ Ze9jEmXpDqeDxE8veWkFna27xT1u13IwJHvjkdAmlFBPo4Ug0+f2tWLSjADYAxutaBBt T1gadfeBSjklGxXXTUMhSLvPmggFQoNnD/wLym+3QgagNFP3dzTeoYYKETV/azqAyPve qEpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722524355; x=1723129155; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NK+uFI5fgUQKpe3JtD5QhhSQyBa6XEcy07C8Ppj6XAQ=; b=Ia4TXXBbKJU079OpN0lcjl9FnBePaGxgHeD6omAvD3TzfiNSTKKXvMWIQ30zZ3+HCN XfCeWXJNVLHCGx0KtxlcywcA6P2YKgqhn/z4bCcPaTomy/v0+qxupfukc5I8t6QBGhPf Kw+KGaDgGkCqsrQ5V1c6VoRUtNVSkjSAb9pyTNmI2rHVOhugchFOiAdofgI8yBtAT7PD yiVBmnQMN0x++IlEmIDLc6lvpqYJ8ki1Jap5K5iqt7PJWofqmrkoMd9chsKEDDSPSsvj +H6yNDHjOXbk4xGRuEnvzc8tM9W5v1rlAap2SfDUP+X8W3cCqLkv9+99Z1cMw5NccbPy zbOA== X-Gm-Message-State: AOJu0Yww/RaU5PTpi7aWw3opQWdoKv14EoJ0LeAEuyChjzUHppIBcxn9 Z8fSdQ1Q6nro2V7w+MjfM38iBBKwtlYFga0wM73HlifwquLQh2Riv0U2IlhUX0bOknxUqislD8/ D5BNY X-Google-Smtp-Source: AGHT+IEIm3e2S4d4P/VSYylb8l5NsJ2xrSXMP4ULqUBt9DrabzCOpW21xTLXPU7CKjUvsO6UQimGtA== X-Received: by 2002:a05:6402:457:b0:5a3:d140:1a57 with SMTP id 4fb4d7f45d1cf-5b7f3502166mr614230a12.1.1722524355024; Thu, 01 Aug 2024 07:59:15 -0700 (PDT) Received: from platypus.lan ([2a04:cec2:9:dc84:3622:6733:ff49:ee91]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5ac63590592sm10252456a12.25.2024.08.01.07.59.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Aug 2024 07:59:14 -0700 (PDT) From: Arthur Cohen To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, jjasmine Subject: [PATCH 055/125] gccrs: Store visibility properly in ExternalTypeItem Date: Thu, 1 Aug 2024 16:56:51 +0200 Message-ID: <20240801145809.366388-57-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240801145809.366388-2-arthur.cohen@embecosm.com> References: <20240801145809.366388-2-arthur.cohen@embecosm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-14.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=unavailable 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 From: jjasmine Fix issue 2897 gcc/rust/ChangeLog: * hir/rust-ast-lower-extern.h: Add translate_visiblity * hir/tree/rust-hir-item.h: Fix constructor of ExternalTypeItem --- gcc/rust/hir/rust-ast-lower-extern.h | 4 +++- gcc/rust/hir/tree/rust-hir-item.h | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gcc/rust/hir/rust-ast-lower-extern.h b/gcc/rust/hir/rust-ast-lower-extern.h index e92acdc44a1..bd889e244b0 100644 --- a/gcc/rust/hir/rust-ast-lower-extern.h +++ b/gcc/rust/hir/rust-ast-lower-extern.h @@ -133,8 +133,10 @@ public: mappings->get_next_hir_id (crate_num), mappings->get_next_localdef_id (crate_num)); + HIR::Visibility vis = translate_visibility (type.get_visibility ()); + translated = new HIR::ExternalTypeItem (mapping, type.get_identifier (), - type.get_locus ()); + vis, type.get_locus ()); } private: diff --git a/gcc/rust/hir/tree/rust-hir-item.h b/gcc/rust/hir/tree/rust-hir-item.h index 3bd0102d4dc..7e0c8c6ffca 100644 --- a/gcc/rust/hir/tree/rust-hir-item.h +++ b/gcc/rust/hir/tree/rust-hir-item.h @@ -3154,9 +3154,9 @@ class ExternalTypeItem : public ExternalItem { public: ExternalTypeItem (Analysis::NodeMapping mappings, Identifier item_name, - location_t locus) + Visibility vis, location_t locus) : ExternalItem (std::move (mappings), std::move (item_name), - Visibility (Visibility::PRIVATE), + Visibility (std::move (vis)), /* FIXME: Is that correct? */ {}, locus) {}