[COMMITTED 097/101] gccrs: AST: Fix for lifetime lowering
arthur.cohen@embecosm.com
arthur.cohen@embecosm.com
Tue Jan 30 12:07:53 GMT 2024
From: Jakub Dupak <dev@jakubdupak.com>
gcc/rust/ChangeLog:
* hir/rust-ast-lower-type.cc (ASTLoweringTypeBounds::visit): fix for lifetimes
(ASTLowerWhereClauseItem::visit): fix for lifetimes
Signed-off-by: Jakub Dupak <dev@jakubdupak.com>
---
gcc/rust/hir/rust-ast-lower-type.cc | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/gcc/rust/hir/rust-ast-lower-type.cc b/gcc/rust/hir/rust-ast-lower-type.cc
index a0178ebf490..504ca051f59 100644
--- a/gcc/rust/hir/rust-ast-lower-type.cc
+++ b/gcc/rust/hir/rust-ast-lower-type.cc
@@ -529,8 +529,13 @@ ASTLoweringTypeBounds::translate (AST::TypeParamBound *type)
void
ASTLoweringTypeBounds::visit (AST::TraitBound &bound)
{
- // FIXME
- std::vector<HIR::LifetimeParam> lifetimes;
+ std::vector<HIR::LifetimeParam> for_lifetimes;
+ for (auto &lifetime_param : bound.get_for_lifetimes ())
+ {
+ auto generic_param = ASTLowerGenericParam::translate (&lifetime_param);
+ for_lifetimes.push_back (
+ *static_cast<HIR::LifetimeParam *> (generic_param));
+ }
AST::TypePath &ast_trait_path = bound.get_type_path ();
HIR::TypePath *trait_path = ASTLowerTypePath::translate (ast_trait_path);
@@ -543,8 +548,9 @@ ASTLoweringTypeBounds::visit (AST::TraitBound &bound)
BoundPolarity polarity = bound.has_opening_question_mark ()
? BoundPolarity::AntiBound
: BoundPolarity::RegularBound;
- translated = new HIR::TraitBound (mapping, *trait_path, bound.get_locus (),
- bound.is_in_parens (), polarity);
+ translated
+ = new HIR::TraitBound (mapping, *trait_path, bound.get_locus (),
+ bound.is_in_parens (), polarity, for_lifetimes);
}
void
@@ -596,6 +602,13 @@ ASTLowerWhereClauseItem::visit (AST::TypeBoundWhereClauseItem &item)
// FIXME
std::vector<HIR::LifetimeParam> for_lifetimes;
+ for (auto &lifetime_param : item.get_for_lifetimes ())
+ {
+ auto generic_param = ASTLowerGenericParam::translate (&lifetime_param);
+ for_lifetimes.push_back (
+ *static_cast<HIR::LifetimeParam *> (generic_param));
+ }
+
std::unique_ptr<HIR::Type> bound_type = std::unique_ptr<HIR::Type> (
ASTLoweringType::translate (item.get_type ().get ()));
--
2.42.1
More information about the Gcc-rust
mailing list