public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/rust/master] ast: Translate visibilities properly when lowering AST nodes
@ 2022-06-08 12:28 Thomas Schwinge
0 siblings, 0 replies; only message in thread
From: Thomas Schwinge @ 2022-06-08 12:28 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:9f5d8a89738cd157205762d2e17b2bbc68b8333c
commit 9f5d8a89738cd157205762d2e17b2bbc68b8333c
Author: Arthur Cohen <arthur.cohen@embecosm.com>
Date: Mon Apr 11 17:09:28 2022 +0200
ast: Translate visibilities properly when lowering AST nodes
Previously, the lowering code would simply create public
`HIR::Visibility`s for every AST Node being lowered. We now call
`translate_visibility()` properly to perform the necessary conversions
Diff:
---
gcc/rust/ast/rust-item.h | 16 ++++++++++++----
gcc/rust/backend/rust-compile-implitem.cc | 4 ++--
gcc/rust/hir/rust-ast-lower-enumitem.h | 13 +++++++------
gcc/rust/hir/rust-ast-lower-extern.h | 5 +++--
gcc/rust/hir/rust-ast-lower-implitem.h | 8 ++++----
gcc/rust/hir/rust-ast-lower-stmt.h | 18 +++++++++---------
gcc/rust/hir/tree/rust-hir-item.h | 8 --------
7 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/gcc/rust/ast/rust-item.h b/gcc/rust/ast/rust-item.h
index aa6bef42f71..f08f2f0c515 100644
--- a/gcc/rust/ast/rust-item.h
+++ b/gcc/rust/ast/rust-item.h
@@ -632,7 +632,7 @@ public:
: public_vis_type (public_vis_type), in_path (std::move (in_path))
{}
- PublicVisType get_public_vis_type () { return public_vis_type; }
+ PublicVisType get_public_vis_type () const { return public_vis_type; }
// Returns whether visibility is in an error state.
bool is_error () const
@@ -884,6 +884,8 @@ public:
FunctionQualifiers get_qualifiers () { return qualifiers; }
+ const Visibility &get_visibility () const { return vis; }
+
protected:
/* Use covariance to implement clone function as returning this object
* rather than base */
@@ -941,8 +943,8 @@ public:
std::string as_string () const override;
// TODO: this mutable getter seems really dodgy. Think up better way.
- Visibility &get_vis () { return visibility; }
- const Visibility &get_vis () const { return visibility; }
+ Visibility &get_visibility () { return visibility; }
+ const Visibility &get_visibility () const { return visibility; }
std::vector<Attribute> &get_outer_attrs () { return outer_attrs; }
const std::vector<Attribute> &get_outer_attrs () const { return outer_attrs; }
@@ -1896,7 +1898,7 @@ public:
return field_type;
}
- Visibility get_visibility () const { return visibility; }
+ const Visibility &get_visibility () const { return visibility; }
NodeId get_node_id () const { return node_id; }
};
@@ -2030,6 +2032,8 @@ public:
NodeId get_node_id () const { return node_id; }
+ const Visibility &get_visibility () const { return visibility; }
+
Location get_locus () const { return locus; }
// TODO: this mutable getter seems really dodgy. Think up better way.
@@ -3921,6 +3925,8 @@ public:
Identifier get_identifier () const { return item_name; }
+ const Visibility &get_visibility () const { return visibility; }
+
bool is_mut () const { return has_mut; }
protected:
@@ -4083,6 +4089,8 @@ public:
Location get_locus () const { return locus; }
+ const Visibility &get_visibility () const { return visibility; }
+
ExternalFunctionItem (
Identifier item_name,
std::vector<std::unique_ptr<GenericParam>> generic_params,
diff --git a/gcc/rust/backend/rust-compile-implitem.cc b/gcc/rust/backend/rust-compile-implitem.cc
index b44cdc984b8..7cc214ce249 100644
--- a/gcc/rust/backend/rust-compile-implitem.cc
+++ b/gcc/rust/backend/rust-compile-implitem.cc
@@ -84,8 +84,8 @@ CompileTraitItem::visit (HIR::TraitItemFunc &func)
&canonical_path);
rust_assert (ok);
- // FIXME: Get from lowering the item's visibility instead
- auto vis = HIR::Visibility::create_public ();
+ // FIXME: How do we get the proper visibility here?
+ auto vis = HIR::Visibility (HIR::Visibility::VisType::PUBLIC);
HIR::TraitFunctionDecl &function = func.get_decl ();
tree fndecl
= compile_function (ctx, function.get_function_name (),
diff --git a/gcc/rust/hir/rust-ast-lower-enumitem.h b/gcc/rust/hir/rust-ast-lower-enumitem.h
index 764c68eb964..1914ce64d09 100644
--- a/gcc/rust/hir/rust-ast-lower-enumitem.h
+++ b/gcc/rust/hir/rust-ast-lower-enumitem.h
@@ -19,6 +19,7 @@
#ifndef RUST_AST_LOWER_ENUMITEM
#define RUST_AST_LOWER_ENUMITEM
+#include "rust-ast-lower.h"
#include "rust-diagnostics.h"
#include "rust-ast-lower-base.h"
@@ -51,7 +52,7 @@ public:
if (item.has_visibility ())
rust_error_at (item.get_locus (),
"visibility qualifier %qs not allowed on enum item",
- item.get_vis ().as_string ().c_str ());
+ item.get_visibility ().as_string ().c_str ());
translated = new HIR::EnumItem (mapping, item.get_identifier (),
item.get_outer_attrs (), item.get_locus ());
@@ -73,12 +74,12 @@ public:
if (item.has_visibility ())
rust_error_at (item.get_locus (),
"visibility qualifier %qs not allowed on enum item",
- item.get_vis ().as_string ().c_str ());
+ item.get_visibility ().as_string ().c_str ());
std::vector<HIR::TupleField> fields;
for (auto &field : item.get_tuple_fields ())
{
- HIR::Visibility vis = HIR::Visibility::create_public ();
+ HIR::Visibility vis = translate_visibility (field.get_visibility ());
HIR::Type *type
= ASTLoweringType::translate (field.get_field_type ().get ());
@@ -117,12 +118,12 @@ public:
if (item.has_visibility ())
rust_error_at (item.get_locus (),
"visibility qualifier %qs not allowed on enum item",
- item.get_vis ().as_string ().c_str ());
+ item.get_visibility ().as_string ().c_str ());
std::vector<HIR::StructField> fields;
for (auto &field : item.get_struct_fields ())
{
- HIR::Visibility vis = HIR::Visibility::create_public ();
+ HIR::Visibility vis = translate_visibility (field.get_visibility ());
HIR::Type *type
= ASTLoweringType::translate (field.get_field_type ().get ());
@@ -165,7 +166,7 @@ public:
if (item.has_visibility ())
rust_error_at (item.get_locus (),
"visibility qualifier %qs not allowed on enum item",
- item.get_vis ().as_string ().c_str ());
+ item.get_visibility ().as_string ().c_str ());
HIR::Expr *expr = ASTLoweringExpr::translate (item.get_expr ().get ());
translated
diff --git a/gcc/rust/hir/rust-ast-lower-extern.h b/gcc/rust/hir/rust-ast-lower-extern.h
index 0225929d37d..1dfecb94fcc 100644
--- a/gcc/rust/hir/rust-ast-lower-extern.h
+++ b/gcc/rust/hir/rust-ast-lower-extern.h
@@ -21,6 +21,7 @@
#include "rust-ast-lower-base.h"
#include "rust-ast-lower-type.h"
+#include "rust-ast-lower.h"
namespace Rust {
namespace HIR {
@@ -39,7 +40,7 @@ public:
void visit (AST::ExternalStaticItem &item) override
{
- HIR::Visibility vis = HIR::Visibility::create_public ();
+ HIR::Visibility vis = translate_visibility (item.get_visibility ());
HIR::Type *static_type
= ASTLoweringType::translate (item.get_type ().get ());
@@ -65,7 +66,7 @@ public:
{
std::vector<std::unique_ptr<HIR::WhereClauseItem> > where_clause_items;
HIR::WhereClause where_clause (std::move (where_clause_items));
- HIR::Visibility vis = HIR::Visibility::create_public ();
+ HIR::Visibility vis = translate_visibility (function.get_visibility ());
std::vector<std::unique_ptr<HIR::GenericParam> > generic_params;
if (function.has_generics ())
diff --git a/gcc/rust/hir/rust-ast-lower-implitem.h b/gcc/rust/hir/rust-ast-lower-implitem.h
index c9dfd1b6505..64803f3056a 100644
--- a/gcc/rust/hir/rust-ast-lower-implitem.h
+++ b/gcc/rust/hir/rust-ast-lower-implitem.h
@@ -56,7 +56,7 @@ public:
{
std::vector<std::unique_ptr<HIR::WhereClauseItem> > where_clause_items;
HIR::WhereClause where_clause (std::move (where_clause_items));
- HIR::Visibility vis = HIR::Visibility::create_public ();
+ HIR::Visibility vis = translate_visibility (alias.get_visibility ());
std::vector<std::unique_ptr<HIR::GenericParam> > generic_params;
if (alias.has_generics ())
@@ -87,7 +87,7 @@ public:
void visit (AST::ConstantItem &constant) override
{
- HIR::Visibility vis = HIR::Visibility::create_public ();
+ HIR::Visibility vis = translate_visibility (constant.get_visibility ());
HIR::Type *type = ASTLoweringType::translate (constant.get_type ().get ());
HIR::Expr *expr = ASTLoweringExpr::translate (constant.get_expr ().get ());
@@ -120,7 +120,7 @@ public:
HIR::WhereClause where_clause (std::move (where_clause_items));
HIR::FunctionQualifiers qualifiers
= lower_qualifiers (function.get_qualifiers ());
- HIR::Visibility vis = HIR::Visibility::create_public ();
+ HIR::Visibility vis = translate_visibility (function.get_visibility ());
// need
std::vector<std::unique_ptr<HIR::GenericParam> > generic_params;
@@ -204,7 +204,7 @@ public:
HIR::WhereClause where_clause (std::move (where_clause_items));
HIR::FunctionQualifiers qualifiers
= lower_qualifiers (method.get_qualifiers ());
- HIR::Visibility vis = HIR::Visibility::create_public ();
+ HIR::Visibility vis = translate_visibility (method.get_visibility ());
// need
std::vector<std::unique_ptr<HIR::GenericParam> > generic_params;
diff --git a/gcc/rust/hir/rust-ast-lower-stmt.h b/gcc/rust/hir/rust-ast-lower-stmt.h
index ede72bd71bf..3ce77b4d9ca 100644
--- a/gcc/rust/hir/rust-ast-lower-stmt.h
+++ b/gcc/rust/hir/rust-ast-lower-stmt.h
@@ -85,7 +85,7 @@ public:
void visit (AST::ConstantItem &constant) override
{
- HIR::Visibility vis = HIR::Visibility::create_public ();
+ HIR::Visibility vis = translate_visibility (constant.get_visibility ());
HIR::Type *type = ASTLoweringType::translate (constant.get_type ().get ());
HIR::Expr *expr = ASTLoweringExpr::translate (constant.get_expr ().get ());
@@ -148,12 +148,12 @@ public:
std::vector<std::unique_ptr<HIR::WhereClauseItem>> where_clause_items;
HIR::WhereClause where_clause (std::move (where_clause_items));
- HIR::Visibility vis = HIR::Visibility::create_public ();
+ HIR::Visibility vis = translate_visibility (struct_decl.get_visibility ());
std::vector<HIR::TupleField> fields;
for (AST::TupleField &field : struct_decl.get_fields ())
{
- HIR::Visibility vis = HIR::Visibility::create_public ();
+ HIR::Visibility vis = translate_visibility (field.get_visibility ());
HIR::Type *type
= ASTLoweringType::translate (field.get_field_type ().get ());
@@ -199,13 +199,13 @@ public:
std::vector<std::unique_ptr<HIR::WhereClauseItem>> where_clause_items;
HIR::WhereClause where_clause (std::move (where_clause_items));
- HIR::Visibility vis = HIR::Visibility::create_public ();
+ HIR::Visibility vis = translate_visibility (struct_decl.get_visibility ());
bool is_unit = struct_decl.is_unit_struct ();
std::vector<HIR::StructField> fields;
for (AST::StructField &field : struct_decl.get_fields ())
{
- HIR::Visibility vis = HIR::Visibility::create_public ();
+ HIR::Visibility vis = translate_visibility (field.get_visibility ());
HIR::Type *type
= ASTLoweringType::translate (field.get_field_type ().get ());
@@ -255,12 +255,12 @@ public:
std::vector<std::unique_ptr<HIR::WhereClauseItem>> where_clause_items;
HIR::WhereClause where_clause (std::move (where_clause_items));
- HIR::Visibility vis = HIR::Visibility::create_public ();
+ HIR::Visibility vis = translate_visibility (union_decl.get_visibility ());
std::vector<HIR::StructField> variants;
for (AST::StructField &variant : union_decl.get_variants ())
{
- HIR::Visibility vis = HIR::Visibility::create_public ();
+ HIR::Visibility vis = translate_visibility (variant.get_visibility ());
HIR::Type *type
= ASTLoweringType::translate (variant.get_field_type ().get ());
@@ -308,7 +308,7 @@ public:
std::vector<std::unique_ptr<HIR::WhereClauseItem>> where_clause_items;
HIR::WhereClause where_clause (std::move (where_clause_items));
- HIR::Visibility vis = HIR::Visibility::create_public ();
+ HIR::Visibility vis = translate_visibility (enum_decl.get_visibility ());
// bool is_unit = enum_decl.is_zero_variant ();
std::vector<std::unique_ptr<HIR::EnumItem>> items;
@@ -358,7 +358,7 @@ public:
HIR::WhereClause where_clause (std::move (where_clause_items));
HIR::FunctionQualifiers qualifiers
= lower_qualifiers (function.get_qualifiers ());
- HIR::Visibility vis = HIR::Visibility::create_public ();
+ HIR::Visibility vis = translate_visibility (function.get_visibility ());
// need
std::vector<std::unique_ptr<HIR::GenericParam>> generic_params;
diff --git a/gcc/rust/hir/tree/rust-hir-item.h b/gcc/rust/hir/tree/rust-hir-item.h
index 3d761806216..0c361e00ecd 100644
--- a/gcc/rust/hir/tree/rust-hir-item.h
+++ b/gcc/rust/hir/tree/rust-hir-item.h
@@ -582,14 +582,6 @@ public:
return Visibility (ERROR, AST::SimplePath::create_empty ());
}
- // Creates a public visibility.
- // FIXME: Remove this function: We should not be calling it anymore and
- // instead we should be using `translate_visibility`
- static Visibility create_public ()
- {
- return Visibility (ERROR, AST::SimplePath::create_empty ());
- }
-
VisType get_vis_type () const { return vis_type; }
std::string as_string () const;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-08 12:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-08 12:28 [gcc/devel/rust/master] ast: Translate visibilities properly when lowering AST nodes Thomas Schwinge
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).