From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 80D77381F701; Wed, 8 Jun 2022 12:08:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 80D77381F701 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] array-copy-init: Add location info X-Act-Checkin: gcc X-Git-Author: Arthur Cohen X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: c6daece64782fd5f03f573b4633d1826794a9f8a X-Git-Newrev: d120c9db1811752e543ef8c231c1501a63dfcea2 Message-Id: <20220608120825.80D77381F701@sourceware.org> Date: Wed, 8 Jun 2022 12:08:25 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jun 2022 12:08:25 -0000 https://gcc.gnu.org/g:d120c9db1811752e543ef8c231c1501a63dfcea2 commit d120c9db1811752e543ef8c231c1501a63dfcea2 Author: Arthur Cohen Date: Thu Feb 17 15:36:21 2022 +0100 array-copy-init: Add location info Diff: --- gcc/rust/ast/rust-expr.h | 7 +++---- gcc/rust/parse/rust-parse-impl.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gcc/rust/ast/rust-expr.h b/gcc/rust/ast/rust-expr.h index 67ef92f8d39..bacf1cd6aae 100644 --- a/gcc/rust/ast/rust-expr.h +++ b/gcc/rust/ast/rust-expr.h @@ -1007,15 +1007,14 @@ class ArrayElemsCopied : public ArrayElems { std::unique_ptr elem_to_copy; std::unique_ptr num_copies; - - // TODO: should this store location data? + Location locus; public: // Constructor requires pointers for polymorphism ArrayElemsCopied (std::unique_ptr copied_elem, - std::unique_ptr copy_amount) + std::unique_ptr copy_amount, Location locus) : ArrayElems (), elem_to_copy (std::move (copied_elem)), - num_copies (std::move (copy_amount)) + num_copies (std::move (copy_amount)), locus (locus) {} // Copy constructor required due to unique_ptr - uses custom clone diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index c4a508062a5..8703ecb8dd6 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -8782,7 +8782,7 @@ Parser::parse_array_expr (AST::AttrVec outer_attrs, std::unique_ptr copied_array_elems ( new AST::ArrayElemsCopied (std::move (initial_expr), - std::move (copy_amount))); + std::move (copy_amount), locus)); return std::unique_ptr ( new AST::ArrayExpr (std::move (copied_array_elems), std::move (inner_attrs),