diff options
| author | Thomas Young <wenzhang5800@gmail.com> | 2021-06-25 13:26:27 +0800 |
|---|---|---|
| committer | Thomas Young <wenzhang5800@gmail.com> | 2021-06-25 13:26:27 +0800 |
| commit | 4d786b72b52efedede1f9f3724d0821ee475ee71 (patch) | |
| tree | 100290dad35671f1bf058241337932ef41306c4e | |
| parent | 862722c6889008068f7dacb553ae130843276a02 (diff) | |
| download | gcc-4d786b72b52efedede1f9f3724d0821ee475ee71.zip gcc-4d786b72b52efedede1f9f3724d0821ee475ee71.tar.gz gcc-4d786b72b52efedede1f9f3724d0821ee475ee71.tar.bz2 | |
make the method get_expr of NegationExpr keep consistant with other HIR.
| -rw-r--r-- | gcc/rust/backend/rust-compile-expr.h | 2 | ||||
| -rw-r--r-- | gcc/rust/hir/tree/rust-hir-expr.h | 2 | ||||
| -rw-r--r-- | gcc/rust/typecheck/rust-hir-const-fold.h | 2 | ||||
| -rw-r--r-- | gcc/rust/typecheck/rust-hir-type-check-expr.h | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/gcc/rust/backend/rust-compile-expr.h b/gcc/rust/backend/rust-compile-expr.h index 5a224e2..8391bc4 100644 --- a/gcc/rust/backend/rust-compile-expr.h +++ b/gcc/rust/backend/rust-compile-expr.h @@ -354,7 +354,7 @@ public: void visit (HIR::NegationExpr &expr) override { auto op = expr.get_expr_type (); - auto negated_expr = CompileExpr::Compile (expr.get_expr (), ctx); + auto negated_expr = CompileExpr::Compile (expr.get_expr ().get (), ctx); auto location = expr.get_locus (); translated diff --git a/gcc/rust/hir/tree/rust-hir-expr.h b/gcc/rust/hir/tree/rust-hir-expr.h index 7a5227a..102ab97 100644 --- a/gcc/rust/hir/tree/rust-hir-expr.h +++ b/gcc/rust/hir/tree/rust-hir-expr.h @@ -300,8 +300,6 @@ public: void accept_vis (HIRVisitor &vis) override; - Expr *get_expr () { return main_or_left_expr.get (); } - protected: /* Use covariance to implement clone function as returning this object rather * than base */ diff --git a/gcc/rust/typecheck/rust-hir-const-fold.h b/gcc/rust/typecheck/rust-hir-const-fold.h index c134d51..90ea595 100644 --- a/gcc/rust/typecheck/rust-hir-const-fold.h +++ b/gcc/rust/typecheck/rust-hir-const-fold.h @@ -341,7 +341,7 @@ public: void visit (HIR::NegationExpr &expr) override { - auto negated_expr = ConstFoldExpr::fold (expr.get_expr ()); + auto negated_expr = ConstFoldExpr::fold (expr.get_expr ().get ()); if (negated_expr == nullptr) return; diff --git a/gcc/rust/typecheck/rust-hir-type-check-expr.h b/gcc/rust/typecheck/rust-hir-type-check-expr.h index ba984f8..236c7b9 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-expr.h +++ b/gcc/rust/typecheck/rust-hir-type-check-expr.h @@ -619,7 +619,8 @@ public: void visit (HIR::NegationExpr &expr) override { - auto negated_expr_ty = TypeCheckExpr::Resolve (expr.get_expr (), false); + auto negated_expr_ty + = TypeCheckExpr::Resolve (expr.get_expr ().get (), false); // https://doc.rust-lang.org/reference/expressions/operator-expr.html#negation-operators switch (expr.get_expr_type ()) |