From: Arthur Cohen <arthur.cohen@embecosm.com>
Date: Thu, 23 Feb 2023 15:59:20 +0000 (+0100)
Subject: gccrs: ast: Add proper visitors for ExternalTypeItem
X-Git-Tag: basepoints/gcc-15~2846
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff8647e88f6c09c6c699b3443de07bc5f7e0742c;p=thirdparty%2Fgcc.git

gccrs: 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 --git a/gcc/rust/ast/rust-ast-dump.cc b/gcc/rust/ast/rust-ast-dump.cc
index a5fce67fda2b..97056c68bfdb 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 2abf7810614d..b4e9d7d00e12 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 e6289270e082..ae653bd741da 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