aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/rust/backend/rust-compile-expr.h5
-rw-r--r--gcc/rust/hir/rust-ast-lower-expr.h19
-rw-r--r--gcc/rust/hir/tree/rust-hir-expr.h6
-rw-r--r--gcc/rust/typecheck/rust-hir-type-check-expr.h5
-rw-r--r--gcc/testsuite/rust.test/compilable/parens1.rs4
5 files changed, 39 insertions, 0 deletions
diff --git a/gcc/rust/backend/rust-compile-expr.h b/gcc/rust/backend/rust-compile-expr.h
index 0d3d9e8..682ff79 100644
--- a/gcc/rust/backend/rust-compile-expr.h
+++ b/gcc/rust/backend/rust-compile-expr.h
@@ -428,6 +428,11 @@ public:
struct_expr.get_locus ());
}
+ void visit (HIR::GroupedExpr &expr)
+ {
+ translated = CompileExpr::Compile (expr.get_expr_in_parens ().get (), ctx);
+ }
+
private:
CompileExpr (Context *ctx) : HIRCompileBase (ctx), translated (nullptr) {}
diff --git a/gcc/rust/hir/rust-ast-lower-expr.h b/gcc/rust/hir/rust-ast-lower-expr.h
index 701efd5..1003e8c 100644
--- a/gcc/rust/hir/rust-ast-lower-expr.h
+++ b/gcc/rust/hir/rust-ast-lower-expr.h
@@ -525,6 +525,25 @@ public:
inner_attribs, outer_attribs);
}
+ void visit (AST::GroupedExpr &expr)
+ {
+ std::vector<HIR::Attribute> inner_attribs;
+ std::vector<HIR::Attribute> outer_attribs;
+
+ HIR::Expr *paren_expr
+ = ASTLoweringExpr::translate (expr.get_expr_in_parens ().get ());
+
+ auto crate_num = mappings->get_current_crate ();
+ Analysis::NodeMapping mapping (crate_num, expr.get_node_id (),
+ mappings->get_next_hir_id (crate_num),
+ UNKNOWN_LOCAL_DEFID);
+
+ translated
+ = new HIR::GroupedExpr (mapping, std::unique_ptr<HIR::Expr> (paren_expr),
+ std::move (inner_attribs),
+ std::move (outer_attribs), expr.get_locus ());
+ }
+
private:
ASTLoweringExpr ()
: translated (nullptr), translated_array_elems (nullptr), terminated (false)
diff --git a/gcc/rust/hir/tree/rust-hir-expr.h b/gcc/rust/hir/tree/rust-hir-expr.h
index 0d67086..bb8499a 100644
--- a/gcc/rust/hir/tree/rust-hir-expr.h
+++ b/gcc/rust/hir/tree/rust-hir-expr.h
@@ -880,6 +880,12 @@ public:
void accept_vis (HIRVisitor &vis) override;
+ std::unique_ptr<Expr> &get_expr_in_parens ()
+ {
+ rust_assert (expr_in_parens != nullptr);
+ return expr_in_parens;
+ }
+
protected:
/* Use covariance to implement clone function as returning this object rather
* than base */
diff --git a/gcc/rust/typecheck/rust-hir-type-check-expr.h b/gcc/rust/typecheck/rust-hir-type-check-expr.h
index 19c6ed4..dd3c8b9 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-expr.h
+++ b/gcc/rust/typecheck/rust-hir-type-check-expr.h
@@ -435,6 +435,11 @@ public:
infered = TypeCheckStructExpr::Resolve (&struct_expr);
}
+ void visit (HIR::GroupedExpr &expr)
+ {
+ infered = TypeCheckExpr::Resolve (expr.get_expr_in_parens ().get ());
+ }
+
private:
TypeCheckExpr (bool is_final_expr)
: TypeCheckBase (), infered (nullptr), infered_array_elems (nullptr),
diff --git a/gcc/testsuite/rust.test/compilable/parens1.rs b/gcc/testsuite/rust.test/compilable/parens1.rs
new file mode 100644
index 0000000..33d9d86
--- /dev/null
+++ b/gcc/testsuite/rust.test/compilable/parens1.rs
@@ -0,0 +1,4 @@
+fn main() {
+ let a = 123;
+ let b = a + (a * 2);
+}