aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/rust/hir/rust-ast-lower-base.cc6
-rw-r--r--gcc/rust/hir/rust-ast-lower-base.h30
-rw-r--r--gcc/rust/hir/rust-ast-lower-implitem.h14
-rw-r--r--gcc/rust/hir/tree/rust-hir-item.h6
-rw-r--r--gcc/rust/hir/tree/rust-hir.h4
-rw-r--r--gcc/rust/typecheck/rust-hir-trait-resolve.cc53
-rw-r--r--gcc/rust/typecheck/rust-hir-trait-resolve.h10
-rw-r--r--gcc/rust/util/rust-hir-map.cc24
-rw-r--r--gcc/rust/util/rust-hir-map.h3
9 files changed, 98 insertions, 52 deletions
diff --git a/gcc/rust/hir/rust-ast-lower-base.cc b/gcc/rust/hir/rust-ast-lower-base.cc
index a674617..d52d108 100644
--- a/gcc/rust/hir/rust-ast-lower-base.cc
+++ b/gcc/rust/hir/rust-ast-lower-base.cc
@@ -824,7 +824,7 @@ ASTLoweringBase::lower_qualifiers (const AST::FunctionQualifiers &qualifiers)
}
void
-ASTLoweringBase::handle_outer_attributes (const HIR::Item &item)
+ASTLoweringBase::handle_outer_attributes (const ItemWrapper &item)
{
for (const auto &attr : item.get_outer_attrs ())
{
@@ -855,7 +855,7 @@ ASTLoweringBase::handle_outer_attributes (const HIR::Item &item)
}
void
-ASTLoweringBase::handle_doc_item_attribute (const HIR::Item &item,
+ASTLoweringBase::handle_doc_item_attribute (const ItemWrapper &item,
const AST::Attribute &attr)
{
auto simple_doc_comment = attr.has_attr_input ()
@@ -878,7 +878,7 @@ ASTLoweringBase::handle_doc_item_attribute (const HIR::Item &item,
}
void
-ASTLoweringBase::handle_lang_item_attribute (const HIR::Item &item,
+ASTLoweringBase::handle_lang_item_attribute (const ItemWrapper &item,
const AST::Attribute &attr)
{
auto &literal = static_cast<AST::AttrInputLiteral &> (attr.get_attr_input ());
diff --git a/gcc/rust/hir/rust-ast-lower-base.h b/gcc/rust/hir/rust-ast-lower-base.h
index 68c57e0..5479e63 100644
--- a/gcc/rust/hir/rust-ast-lower-base.h
+++ b/gcc/rust/hir/rust-ast-lower-base.h
@@ -29,6 +29,30 @@
namespace Rust {
namespace HIR {
+// proxy class so we can do attribute checking on items and trait items
+class ItemWrapper
+{
+public:
+ ItemWrapper (const HIR::Item &item)
+ : mappings (item.get_mappings ()), locus (item.get_locus ()),
+ outer_attrs (item.get_outer_attrs ())
+ {}
+
+ ItemWrapper (const HIR::TraitItem &item)
+ : mappings (item.get_mappings ()), locus (item.get_trait_locus ()),
+ outer_attrs (item.get_outer_attrs ())
+ {}
+
+ const Analysis::NodeMapping &get_mappings () const { return mappings; }
+ Location get_locus () const { return locus; }
+ const AST::AttrVec &get_outer_attrs () const { return outer_attrs; }
+
+private:
+ const Analysis::NodeMapping &mappings;
+ Location locus;
+ const AST::AttrVec &outer_attrs;
+};
+
// base class to allow derivatives to overload as needed
class ASTLoweringBase : public AST::ASTVisitor
{
@@ -264,12 +288,12 @@ protected:
HIR::FunctionQualifiers
lower_qualifiers (const AST::FunctionQualifiers &qualifiers);
- void handle_outer_attributes (const HIR::Item &item);
+ void handle_outer_attributes (const ItemWrapper &item);
- void handle_lang_item_attribute (const HIR::Item &item,
+ void handle_lang_item_attribute (const ItemWrapper &item,
const AST::Attribute &attr);
- void handle_doc_item_attribute (const HIR::Item &item,
+ void handle_doc_item_attribute (const ItemWrapper &item,
const AST::Attribute &attr);
bool is_known_attribute (const std::string &attribute_path) const;
diff --git a/gcc/rust/hir/rust-ast-lower-implitem.h b/gcc/rust/hir/rust-ast-lower-implitem.h
index d5ca475..4f3e813 100644
--- a/gcc/rust/hir/rust-ast-lower-implitem.h
+++ b/gcc/rust/hir/rust-ast-lower-implitem.h
@@ -305,16 +305,14 @@ public:
if (resolver.translated != nullptr)
{
- // FIXME
+ auto id = resolver.translated->get_mappings ().get_hirid ();
+ auto defid = resolver.translated->get_mappings ().get_defid ();
+ auto locus = resolver.translated->get_trait_locus ();
- // auto id = resolver.translated->get_mappings ().get_hirid ();
- // auto defid = resolver.translated->get_mappings ().get_defid ();
- // auto locus = resolver.translated->get_locus ();
-
- // resolver.handle_outer_attributes (*resolver.translated);
+ resolver.handle_outer_attributes (*resolver.translated);
resolver.mappings->insert_hir_trait_item (resolver.translated);
- // resolver.mappings->insert_location (id, locus);
- // resolver.mappings->insert_defid_mapping (defid, resolver.item_cast);
+ resolver.mappings->insert_location (id, locus);
+ resolver.mappings->insert_defid_mapping (defid, resolver.translated);
}
return resolver.translated;
diff --git a/gcc/rust/hir/tree/rust-hir-item.h b/gcc/rust/hir/tree/rust-hir-item.h
index 394b04f..d84e41e 100644
--- a/gcc/rust/hir/tree/rust-hir-item.h
+++ b/gcc/rust/hir/tree/rust-hir-item.h
@@ -2394,6 +2394,8 @@ public:
return outer_attrs;
}
+ Location get_trait_locus () const override { return get_locus (); }
+
protected:
// Clone function implementation as (not pure) virtual method
TraitItemFunc *clone_trait_item_impl () const override
@@ -2480,6 +2482,8 @@ public:
return outer_attrs;
}
+ Location get_trait_locus () const override { return get_locus (); }
+
protected:
// Clone function implementation as (not pure) virtual method
TraitItemConst *clone_trait_item_impl () const override
@@ -2567,6 +2571,8 @@ public:
return outer_attrs;
}
+ Location get_trait_locus () const override { return get_locus (); }
+
protected:
// Clone function implementation as (not pure) virtual method
TraitItemType *clone_trait_item_impl () const override
diff --git a/gcc/rust/hir/tree/rust-hir.h b/gcc/rust/hir/tree/rust-hir.h
index 927ac06..26bf302 100644
--- a/gcc/rust/hir/tree/rust-hir.h
+++ b/gcc/rust/hir/tree/rust-hir.h
@@ -796,7 +796,9 @@ public:
virtual const std::string trait_identifier () const = 0;
- const Analysis::NodeMapping get_mappings () const { return mappings; }
+ const Analysis::NodeMapping &get_mappings () const { return mappings; }
+
+ virtual Location get_trait_locus () const = 0;
virtual TraitItemKind get_item_kind () const = 0;
diff --git a/gcc/rust/typecheck/rust-hir-trait-resolve.cc b/gcc/rust/typecheck/rust-hir-trait-resolve.cc
index 146fe26..cc23fe2 100644
--- a/gcc/rust/typecheck/rust-hir-trait-resolve.cc
+++ b/gcc/rust/typecheck/rust-hir-trait-resolve.cc
@@ -91,33 +91,42 @@ TraitResolver::Lookup (HIR::TypePath &path)
return resolver.lookup_path (path);
}
-TraitResolver::TraitResolver ()
- : TypeCheckBase (), resolved_trait_reference (nullptr)
-{}
+TraitResolver::TraitResolver () : TypeCheckBase () {}
-TraitReference *
-TraitResolver::resolve_path (HIR::TypePath &path)
+bool
+TraitResolver::resolve_path_to_trait (const HIR::TypePath &path,
+ HIR::Trait **resolved) const
{
NodeId ref;
if (!resolver->lookup_resolved_type (path.get_mappings ().get_nodeid (),
&ref))
{
rust_error_at (path.get_locus (), "Failed to resolve path to node-id");
- return &TraitReference::error_node ();
+ return false;
}
HirId hir_node = UNKNOWN_HIRID;
if (!mappings->lookup_node_to_hir (ref, &hir_node))
{
rust_error_at (path.get_locus (), "Failed to resolve path to hir-id");
- return &TraitReference::error_node ();
+ return false;
}
HIR::Item *resolved_item = mappings->lookup_hir_item (hir_node);
-
rust_assert (resolved_item != nullptr);
- resolved_item->accept_vis (*this);
- rust_assert (resolved_trait_reference != nullptr);
+ rust_assert (resolved_item->get_item_kind () == HIR::Item::ItemKind::Trait);
+ *resolved = static_cast<HIR::Trait *> (resolved_item);
+
+ return true;
+}
+
+TraitReference *
+TraitResolver::resolve_path (HIR::TypePath &path)
+{
+ HIR::Trait *resolved_trait_reference;
+ bool ok = resolve_path_to_trait (path, &resolved_trait_reference);
+ if (!ok)
+ return &TraitReference::error_node ();
return resolve_trait (resolved_trait_reference);
}
@@ -237,26 +246,10 @@ TraitResolver::resolve_trait (HIR::Trait *trait_reference)
TraitReference *
TraitResolver::lookup_path (HIR::TypePath &path)
{
- NodeId ref;
- if (!resolver->lookup_resolved_type (path.get_mappings ().get_nodeid (),
- &ref))
- {
- rust_error_at (path.get_locus (), "Failed to resolve path to node-id");
- return &TraitReference::error_node ();
- }
-
- HirId hir_node = UNKNOWN_HIRID;
- if (!mappings->lookup_node_to_hir (ref, &hir_node))
- {
- rust_error_at (path.get_locus (), "Failed to resolve path to hir-id");
- return &TraitReference::error_node ();
- }
-
- HIR::Item *resolved_item = mappings->lookup_hir_item (hir_node);
-
- rust_assert (resolved_item != nullptr);
- resolved_item->accept_vis (*this);
- rust_assert (resolved_trait_reference != nullptr);
+ HIR::Trait *resolved_trait_reference;
+ bool ok = resolve_path_to_trait (path, &resolved_trait_reference);
+ if (!ok)
+ return &TraitReference::error_node ();
TraitReference *tref = &TraitReference::error_node ();
if (context->lookup_trait_reference (
diff --git a/gcc/rust/typecheck/rust-hir-trait-resolve.h b/gcc/rust/typecheck/rust-hir-trait-resolve.h
index c4aaf42..468f429 100644
--- a/gcc/rust/typecheck/rust-hir-trait-resolve.h
+++ b/gcc/rust/typecheck/rust-hir-trait-resolve.h
@@ -55,10 +55,8 @@ private:
std::vector<TyTy::SubstitutionParamMapping> substitutions;
};
-class TraitResolver : public TypeCheckBase, private HIR::HIRFullVisitorBase
+class TraitResolver : public TypeCheckBase
{
- using HIR::HIRFullVisitorBase::visit;
-
public:
static TraitReference *Resolve (HIR::TypePath &path);
@@ -75,10 +73,8 @@ private:
TraitReference *lookup_path (HIR::TypePath &path);
- HIR::Trait *resolved_trait_reference;
-
-public:
- void visit (HIR::Trait &trait) override { resolved_trait_reference = &trait; }
+ bool resolve_path_to_trait (const HIR::TypePath &path,
+ HIR::Trait **resolved) const;
};
} // namespace Resolver
diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc
index 53c5b5a..cb540cd 100644
--- a/gcc/rust/util/rust-hir-map.cc
+++ b/gcc/rust/util/rust-hir-map.cc
@@ -316,6 +316,7 @@ Mappings::insert_defid_mapping (DefId id, HIR::Item *item)
rust_assert (lookup_defid (id) == nullptr);
rust_assert (lookup_local_defid (crate_num, local_def_id) == nullptr);
+ rust_assert (lookup_trait_item_defid (id) == nullptr);
defIdMappings[id] = item;
insert_local_defid_mapping (crate_num, local_def_id, item);
@@ -332,6 +333,29 @@ Mappings::lookup_defid (DefId id)
}
void
+Mappings::insert_defid_mapping (DefId id, HIR::TraitItem *item)
+{
+ CrateNum crate_num = id.crateNum;
+ LocalDefId local_def_id = id.localDefId;
+
+ rust_assert (lookup_defid (id) == nullptr);
+ rust_assert (lookup_local_defid (crate_num, local_def_id) == nullptr);
+ rust_assert (lookup_trait_item_defid (id) == nullptr);
+
+ defIdTraitItemMappings[id] = item;
+}
+
+HIR::TraitItem *
+Mappings::lookup_trait_item_defid (DefId id)
+{
+ auto it = defIdTraitItemMappings.find (id);
+ if (it == defIdTraitItemMappings.end ())
+ return nullptr;
+
+ return it->second;
+}
+
+void
Mappings::insert_hir_item (HIR::Item *item)
{
auto id = item->get_mappings ().get_hirid ();
diff --git a/gcc/rust/util/rust-hir-map.h b/gcc/rust/util/rust-hir-map.h
index 5913a02..4c7e562 100644
--- a/gcc/rust/util/rust-hir-map.h
+++ b/gcc/rust/util/rust-hir-map.h
@@ -104,6 +104,8 @@ public:
void insert_defid_mapping (DefId id, HIR::Item *item);
HIR::Item *lookup_defid (DefId id);
+ void insert_defid_mapping (DefId id, HIR::TraitItem *item);
+ HIR::TraitItem *lookup_trait_item_defid (DefId id);
void insert_local_defid_mapping (CrateNum crateNum, LocalDefId id,
HIR::Item *item);
@@ -307,6 +309,7 @@ private:
std::map<CrateNum, AST::Crate *> ast_crate_mappings;
std::map<CrateNum, HIR::Crate *> hir_crate_mappings;
std::map<DefId, HIR::Item *> defIdMappings;
+ std::map<DefId, HIR::TraitItem *> defIdTraitItemMappings;
std::map<CrateNum, std::map<LocalDefId, HIR::Item *>> localDefIdMappings;
std::map<HirId, HIR::Module *> hirModuleMappings;
generated by cgit v1.1 at 2025-05-30 17:46:46 +0000