From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 03D973858412; Tue, 28 Feb 2023 22:36:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 03D973858412 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677623784; bh=UP2x6Uo/4qtYjn6WY9wJ+ykgBz0EwX1GjyvVPmFW9eE=; h=From:To:Subject:Date:From; b=NYR4qUmqTDfxyKPvSz7ARwvaEpimbP48DoAXRI95afKPsBxl+wJEe90if7LvggOwH 6Oe0AR6xdnABE1D5NYKQI0L3ohL/mV39P7cDJ0SMOJQQvGxPMvRC6rU20mHfVrTyrq FIvnp5HqEMMYD+RBXS1dALwXSTPZHKeZOJBdmjz4= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] ast: Add proper visitors for ExternalTypeItem X-Act-Checkin: gcc X-Git-Author: Arthur Cohen X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 782d6d062dddb6821ff492b316c7cb02eb6aff52 X-Git-Newrev: 9a0f9fb8ba2140fb365b9c771c733401de929ff2 Message-Id: <20230228223624.03D973858412@sourceware.org> Date: Tue, 28 Feb 2023 22:36:24 +0000 (GMT) List-Id: https://gcc.gnu.org/g:9a0f9fb8ba2140fb365b9c771c733401de929ff2 commit 9a0f9fb8ba2140fb365b9c771c733401de929ff2 Author: Arthur Cohen Date: Thu Feb 23 16:59:20 2023 +0100 ast: Add proper visitors for ExternalTypeItem gcc/rust/ChangeLog: * ast/rust-item.h: Add non-const `get_visibility` to ExternalTypeItem. * ast/rust-ast-dump.cc (Dump::visit): Add implementation for ExternalTypeItem. * expand/rust-attribute-visitor.cc (AttrVisitor::visit): Likewise. Diff: --- gcc/rust/ast/rust-ast-dump.cc | 6 +++++- gcc/rust/ast/rust-item.h | 1 + gcc/rust/expand/rust-attribute-visitor.cc | 9 ++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gcc/rust/ast/rust-ast-dump.cc b/gcc/rust/ast/rust-ast-dump.cc index 1fd312a5b94..1cfcebbab9d 100644 --- a/gcc/rust/ast/rust-ast-dump.cc +++ b/gcc/rust/ast/rust-ast-dump.cc @@ -1434,7 +1434,11 @@ Dump::visit (TraitImpl &impl) void Dump::visit (ExternalTypeItem &type) -{} +{ + visit (type.get_visibility ()); + + stream << "type " << type.get_identifier () << ';'; +} void Dump::visit (ExternalStaticItem &) diff --git a/gcc/rust/ast/rust-item.h b/gcc/rust/ast/rust-item.h index 4be4ca1666f..ab7d323607b 100644 --- a/gcc/rust/ast/rust-item.h +++ b/gcc/rust/ast/rust-item.h @@ -3971,6 +3971,7 @@ public: Identifier get_identifier () const { return item_name; } + Visibility &get_visibility () { return visibility; } const Visibility &get_visibility () const { return visibility; } protected: diff --git a/gcc/rust/expand/rust-attribute-visitor.cc b/gcc/rust/expand/rust-attribute-visitor.cc index a5aa8f0e6e9..ce93986003d 100644 --- a/gcc/rust/expand/rust-attribute-visitor.cc +++ b/gcc/rust/expand/rust-attribute-visitor.cc @@ -2738,7 +2738,14 @@ AttrVisitor::visit (AST::TraitImpl &impl) void AttrVisitor::visit (AST::ExternalTypeItem &item) { - // TODO: ARTHUR + expander.expand_cfg_attrs (item.get_outer_attrs ()); + + if (expander.fails_cfg_with_expand (item.get_outer_attrs ())) + item.mark_for_strip (); + + // TODO: Can we do anything like expand a macro here? + // extern "C" { type ffi_ty!(); } + // ? } void