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] Fix assignment operator overloads for AST and HIR patterns
Date: Sun, 5 Mar 2023 11:41:04 +0000 (GMT) [thread overview]
Message-ID: <20230305114104.124903858D28@sourceware.org> (raw)
https://gcc.gnu.org/g:9dce6f995c2b3bc021a97872b413807de7d294b1
commit 9dce6f995c2b3bc021a97872b413807de7d294b1
Author: Owen Avery <powerboat9.gamer@gmail.com>
Date: Mon Feb 27 11:18:56 2023 -0500
Fix assignment operator overloads for AST and HIR patterns
gcc/rust/ChangeLog:
* ast/rust-pattern.h
(StructPatternElements::operator=): Clear vector before inserting.
(TupleStructItemsNoRange::operator=): Clear vector before inserting.
(TupleStructItemsRange::operator=): Clear vectors before inserting.
(TuplePatternItemsMultiple::operator=): Clear vector before inserting.
(TuplePatternItemsRanged::operator=): Clear vectors before inserting.
(SlicePattern::operator=): Clear vector before inserting.
(AltPattern::operator=): Clear vector before inserting.
* hir/tree/rust-hir-pattern.h
(StructPatternElements::operator=): Clear vector before inserting.
(TupleStructItemsNoRange::operator=): Clear vector before inserting.
(TupleStructItemsRange::operator=): Clear vectors before inserting.
(TuplePatternItemsMultiple::operator=): Clear vector before inserting.
(TuplePatternItemsRanged::operator=): Clear vectors before inserting.
(SlicePattern::operator=): Clear vector before inserting.
Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
Diff:
---
gcc/rust/ast/rust-pattern.h | 9 +++++++++
gcc/rust/hir/tree/rust-hir-pattern.h | 8 ++++++++
2 files changed, 17 insertions(+)
diff --git a/gcc/rust/ast/rust-pattern.h b/gcc/rust/ast/rust-pattern.h
index 054b308c954..3d7cbed37c3 100644
--- a/gcc/rust/ast/rust-pattern.h
+++ b/gcc/rust/ast/rust-pattern.h
@@ -830,6 +830,7 @@ public:
struct_pattern_etc_attrs = other.struct_pattern_etc_attrs;
has_struct_pattern_etc = other.has_struct_pattern_etc;
+ fields.clear ();
fields.reserve (other.fields.size ());
for (const auto &e : other.fields)
fields.push_back (e->clone_struct_pattern_field ());
@@ -986,6 +987,7 @@ public:
// Overloaded assignment operator with vector clone
TupleStructItemsNoRange &operator= (TupleStructItemsNoRange const &other)
{
+ patterns.clear ();
patterns.reserve (other.patterns.size ());
for (const auto &e : other.patterns)
patterns.push_back (e->clone_pattern ());
@@ -1048,10 +1050,12 @@ public:
// Overloaded assignment operator to clone
TupleStructItemsRange &operator= (TupleStructItemsRange const &other)
{
+ lower_patterns.clear ();
lower_patterns.reserve (other.lower_patterns.size ());
for (const auto &e : other.lower_patterns)
lower_patterns.push_back (e->clone_pattern ());
+ upper_patterns.clear ();
upper_patterns.reserve (other.upper_patterns.size ());
for (const auto &e : other.upper_patterns)
upper_patterns.push_back (e->clone_pattern ());
@@ -1263,6 +1267,7 @@ public:
// Overloaded assignment operator to vector clone
TuplePatternItemsMultiple &operator= (TuplePatternItemsMultiple const &other)
{
+ patterns.clear ();
patterns.reserve (other.patterns.size ());
for (const auto &e : other.patterns)
patterns.push_back (e->clone_pattern ());
@@ -1328,10 +1333,12 @@ public:
// Overloaded assignment operator to clone
TuplePatternItemsRanged &operator= (TuplePatternItemsRanged const &other)
{
+ lower_patterns.clear ();
lower_patterns.reserve (other.lower_patterns.size ());
for (const auto &e : other.lower_patterns)
lower_patterns.push_back (e->clone_pattern ());
+ upper_patterns.clear ();
upper_patterns.reserve (other.upper_patterns.size ());
for (const auto &e : other.upper_patterns)
upper_patterns.push_back (e->clone_pattern ());
@@ -1541,6 +1548,7 @@ public:
locus = other.locus;
node_id = other.node_id;
+ items.clear ();
items.reserve (other.items.size ());
for (const auto &e : other.items)
items.push_back (e->clone_pattern ());
@@ -1607,6 +1615,7 @@ public:
locus = other.locus;
node_id = other.node_id;
+ alts.clear ();
alts.reserve (other.alts.size ());
for (const auto &e : other.alts)
alts.push_back (e->clone_pattern ());
diff --git a/gcc/rust/hir/tree/rust-hir-pattern.h b/gcc/rust/hir/tree/rust-hir-pattern.h
index 293616f2a9d..47a38cc075c 100644
--- a/gcc/rust/hir/tree/rust-hir-pattern.h
+++ b/gcc/rust/hir/tree/rust-hir-pattern.h
@@ -696,6 +696,7 @@ public:
// Overloaded assignment operator with vector clone
StructPatternElements &operator= (StructPatternElements const &other)
{
+ fields.clear ();
fields.reserve (other.fields.size ());
for (const auto &e : other.fields)
fields.push_back (e->clone_struct_pattern_field ());
@@ -819,6 +820,7 @@ public:
// Overloaded assignment operator with vector clone
TupleStructItemsNoRange &operator= (TupleStructItemsNoRange const &other)
{
+ patterns.clear ();
patterns.reserve (other.patterns.size ());
for (const auto &e : other.patterns)
patterns.push_back (e->clone_pattern ());
@@ -880,10 +882,12 @@ public:
// Overloaded assignment operator to clone
TupleStructItemsRange &operator= (TupleStructItemsRange const &other)
{
+ lower_patterns.clear ();
lower_patterns.reserve (other.lower_patterns.size ());
for (const auto &e : other.lower_patterns)
lower_patterns.push_back (e->clone_pattern ());
+ upper_patterns.clear ();
upper_patterns.reserve (other.upper_patterns.size ());
for (const auto &e : other.upper_patterns)
upper_patterns.push_back (e->clone_pattern ());
@@ -1050,6 +1054,7 @@ public:
// Overloaded assignment operator to vector clone
TuplePatternItemsMultiple &operator= (TuplePatternItemsMultiple const &other)
{
+ patterns.clear ();
patterns.reserve (other.patterns.size ());
for (const auto &e : other.patterns)
patterns.push_back (e->clone_pattern ());
@@ -1114,10 +1119,12 @@ public:
// Overloaded assignment operator to clone
TuplePatternItemsRanged &operator= (TuplePatternItemsRanged const &other)
{
+ lower_patterns.clear ();
lower_patterns.reserve (other.lower_patterns.size ());
for (const auto &e : other.lower_patterns)
lower_patterns.push_back (e->clone_pattern ());
+ lower_patterns.clear ();
upper_patterns.reserve (other.upper_patterns.size ());
for (const auto &e : other.upper_patterns)
upper_patterns.push_back (e->clone_pattern ());
@@ -1257,6 +1264,7 @@ public:
locus = other.locus;
mappings = other.mappings;
+ items.clear ();
items.reserve (other.items.size ());
for (const auto &e : other.items)
items.push_back (e->clone_pattern ());
reply other threads:[~2023-03-05 11:41 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=20230305114104.124903858D28@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: link
Be 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).