public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Thomas Schwinge <tschwinge@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Desugar double borrows into two HIR:BorrowExpr's Date: Mon, 29 Aug 2022 15:36:17 +0000 (GMT) [thread overview] Message-ID: <20220829153617.1E48E385742E@sourceware.org> (raw) https://gcc.gnu.org/g:727afe64d6c6ccc6c360da0707de4b2bd74a96d9 commit 727afe64d6c6ccc6c360da0707de4b2bd74a96d9 Author: Philip Herron <philip.herron@embecosm.com> Date: Thu Aug 25 15:33:02 2022 +0100 Desugar double borrows into two HIR:BorrowExpr's We simply hit a gcc_unreachable() on double borrows but it seems reasonable to just desugar the AST into a borrow of a borrow to foo. Instead of a borrow expression with a flag to be respected. Fixes #1506 Diff: --- gcc/rust/hir/rust-ast-lower-expr.h | 27 ++++++++++++++++++++---- gcc/rust/hir/tree/rust-hir-expr.h | 5 ++--- gcc/rust/typecheck/rust-hir-type-check-expr.cc | 6 ------ gcc/testsuite/rust/compile/torture/issue-1506.rs | 3 +++ 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/gcc/rust/hir/rust-ast-lower-expr.h b/gcc/rust/hir/rust-ast-lower-expr.h index 4f7f40f27e4..be045e930d1 100644 --- a/gcc/rust/hir/rust-ast-lower-expr.h +++ b/gcc/rust/hir/rust-ast-lower-expr.h @@ -643,10 +643,29 @@ public: mappings->get_next_hir_id (crate_num), UNKNOWN_LOCAL_DEFID); - translated = new HIR::BorrowExpr ( - mapping, std::unique_ptr<HIR::Expr> (borrow_lvalue), - expr.get_is_mut () ? Mutability::Mut : Mutability::Imm, - expr.get_is_double_borrow (), expr.get_outer_attrs (), expr.get_locus ()); + HIR::BorrowExpr *borrow_expr + = new HIR::BorrowExpr (mapping, + std::unique_ptr<HIR::Expr> (borrow_lvalue), + expr.get_is_mut () ? Mutability::Mut + : Mutability::Imm, + expr.get_outer_attrs (), expr.get_locus ()); + + if (expr.get_is_double_borrow ()) + { + NodeId artifical_bouble_borrow_id = mappings->get_next_node_id (); + Analysis::NodeMapping mapping (crate_num, artifical_bouble_borrow_id, + mappings->get_next_hir_id (crate_num), + UNKNOWN_LOCAL_DEFID); + + borrow_expr + = new HIR::BorrowExpr (mapping, + std::unique_ptr<HIR::Expr> (borrow_expr), + expr.get_is_mut () ? Mutability::Mut + : Mutability::Imm, + expr.get_outer_attrs (), expr.get_locus ()); + } + + translated = borrow_expr; } void visit (AST::DereferenceExpr &expr) override diff --git a/gcc/rust/hir/tree/rust-hir-expr.h b/gcc/rust/hir/tree/rust-hir-expr.h index 83278529646..e173d376674 100644 --- a/gcc/rust/hir/tree/rust-hir-expr.h +++ b/gcc/rust/hir/tree/rust-hir-expr.h @@ -192,10 +192,10 @@ public: BorrowExpr (Analysis::NodeMapping mappings, std::unique_ptr<Expr> borrow_lvalue, Mutability mut, - bool is_double_borrow, AST::AttrVec outer_attribs, Location locus) + AST::AttrVec outer_attribs, Location locus) : OperatorExpr (std::move (mappings), std::move (borrow_lvalue), std::move (outer_attribs), locus), - mut (mut), double_borrow (is_double_borrow) + mut (mut) {} void accept_vis (HIRFullVisitor &vis) override; @@ -203,7 +203,6 @@ public: Mutability get_mut () const { return mut; } bool is_mut () const { return mut == Mutability::Mut; } - bool get_is_double_borrow () const { return double_borrow; } protected: /* Use covariance to implement clone function as returning this object rather diff --git a/gcc/rust/typecheck/rust-hir-type-check-expr.cc b/gcc/rust/typecheck/rust-hir-type-check-expr.cc index 4371f5a59a5..9dc72a1472b 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-expr.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-expr.cc @@ -1209,12 +1209,6 @@ TypeCheckExpr::visit (HIR::BorrowExpr &expr) } } - if (expr.get_is_double_borrow ()) - { - // FIXME double_reference - gcc_unreachable (); - } - infered = new TyTy::ReferenceType (expr.get_mappings ().get_hirid (), TyTy::TyVar (resolved_base->get_ref ()), expr.get_mut ()); diff --git a/gcc/testsuite/rust/compile/torture/issue-1506.rs b/gcc/testsuite/rust/compile/torture/issue-1506.rs new file mode 100644 index 00000000000..a38f23144ed --- /dev/null +++ b/gcc/testsuite/rust/compile/torture/issue-1506.rs @@ -0,0 +1,3 @@ +pub fn main() { + let _: &i32 = &&&&1; +}
reply other threads:[~2022-08-29 15:36 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220829153617.1E48E385742E@sourceware.org \ --to=tschwinge@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).