diff options
| author | Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> | 2024-03-08 14:42:10 +0100 |
|---|---|---|
| committer | P-E-P <32375388+P-E-P@users.noreply.github.com> | 2024-11-20 13:36:42 +0000 |
| commit | 6b5039f20e8827549e7946a280a80bb5db0b10ce (patch) | |
| tree | 56a66151171d975efcd9439ad0fa4175417986cc /gcc/rust/hir | |
| parent | 2d6d91a776ebd26d3bad128cfec00a60540a659b (diff) | |
| download | gcc-6b5039f20e8827549e7946a280a80bb5db0b10ce.zip gcc-6b5039f20e8827549e7946a280a80bb5db0b10ce.tar.gz gcc-6b5039f20e8827549e7946a280a80bb5db0b10ce.tar.bz2 | |
Refactor HIR with optionals, references & newtypes
The HIR made heavy use of pair and other unamed types which can be
difficult to read.
gcc/rust/ChangeLog:
* backend/rust-compile-base.cc: Use FnParam getter.
* backend/rust-compile-expr.cc (CompileExpr::visit): Likewise.
* backend/rust-compile-intrinsic.cc: Likewise.
* backend/rust-compile-type.cc: Likewise.
* checks/errors/privacy/rust-privacy-reporter.cc (PrivacyReporter::visit):
Only visit childrens if not missing.
* checks/errors/rust-unsafe-checker.cc (UnsafeChecker::visit): Use
a reference instead of a raw pointer.
* hir/tree/rust-hir-expr.h: Add presence function for return
expression.
* hir/tree/rust-hir-item.h: Remove take_param_name.
* hir/tree/rust-hir.h: Make mapping getter const.
* typecheck/rust-hir-dot-operator.cc (MethodResolver::Select): Use
getter.
* typecheck/rust-hir-type-check-expr.cc: Likewise.
* typecheck/rust-hir-type-check-implitem.cc: Use FnParam vector instead
of std::pair of Pattern and BaseType.
* typecheck/rust-hir-type-check-item.cc: Likewise.
* typecheck/rust-hir-type-check.cc: Likewise.
* typecheck/rust-tyty-call.cc (TypeCheckCallExpr::visit): Use getters.
(TypeCheckMethodCallExpr::check): Likewise.
* typecheck/rust-tyty-cmp.h: Likewise.
* typecheck/rust-tyty.cc: Use FnParam.
* typecheck/rust-tyty.h (class FnParam): Add FnParam to handle function
parameters instead of handling std::pairs.
* typecheck/rust-unify.cc (UnifyRules::expect_fndef): Use getters.
(UnifyRules::expect_fnptr): Likewise.
Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Diffstat (limited to 'gcc/rust/hir')
| -rw-r--r-- | gcc/rust/hir/tree/rust-hir-expr.h | 2 | ||||
| -rw-r--r-- | gcc/rust/hir/tree/rust-hir-item.h | 2 | ||||
| -rw-r--r-- | gcc/rust/hir/tree/rust-hir.h | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/gcc/rust/hir/tree/rust-hir-expr.h b/gcc/rust/hir/tree/rust-hir-expr.h index c4a821e..c0d10c2 100644 --- a/gcc/rust/hir/tree/rust-hir-expr.h +++ b/gcc/rust/hir/tree/rust-hir-expr.h @@ -2238,6 +2238,7 @@ public: bool is_final_stmt (Stmt *stmt) { return statements.back ().get () == stmt; } + bool has_final_expr () { return expr != nullptr; } Expr &get_final_expr () { return *expr; } std::vector<std::unique_ptr<Stmt> > &get_statements () { return statements; } @@ -2785,6 +2786,7 @@ public: void accept_vis (HIRFullVisitor &vis) override; void accept_vis (HIRExpressionVisitor &vis) override; + bool has_expr () { return return_expr != nullptr; } Expr &get_expr () { return *return_expr; } ExprType get_expression_type () const override final diff --git a/gcc/rust/hir/tree/rust-hir-item.h b/gcc/rust/hir/tree/rust-hir-item.h index ba554d5..92e8fc3 100644 --- a/gcc/rust/hir/tree/rust-hir-item.h +++ b/gcc/rust/hir/tree/rust-hir-item.h @@ -549,8 +549,6 @@ public: Pattern &get_param_name () { return *param_name; } - std::unique_ptr<Pattern> take_param_name () { return std::move (param_name); } - Type &get_type () { return *type; } const Analysis::NodeMapping &get_mappings () const { return mappings; } diff --git a/gcc/rust/hir/tree/rust-hir.h b/gcc/rust/hir/tree/rust-hir.h index 44dcc8e..05d855c 100644 --- a/gcc/rust/hir/tree/rust-hir.h +++ b/gcc/rust/hir/tree/rust-hir.h @@ -465,7 +465,10 @@ public: virtual void accept_vis (HIRTypeVisitor &vis) = 0; - virtual Analysis::NodeMapping get_mappings () const { return mappings; } + virtual const Analysis::NodeMapping &get_mappings () const + { + return mappings; + } virtual location_t get_locus () const { return locus; } protected: |