diff options
author | Owen Avery <powerboat9.gamer@gmail.com> | 2023-02-27 11:18:56 -0500 |
---|---|---|
committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2024-01-16 18:19:01 +0100 |
commit | 98b83ea8a41763d1a760a79a27132fbc610b93d4 (patch) | |
tree | 4cf86cba70e005ec61ae85e9a9a69387d5efe03b | |
parent | 525110ae4951fcc1ca3e858d6afa23823b79b8f0 (diff) | |
download | gcc-98b83ea8a41763d1a760a79a27132fbc610b93d4.zip gcc-98b83ea8a41763d1a760a79a27132fbc610b93d4.tar.gz gcc-98b83ea8a41763d1a760a79a27132fbc610b93d4.tar.bz2 |
gccrs: 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>
-rw-r--r-- | gcc/rust/ast/rust-pattern.h | 9 | ||||
-rw-r--r-- | gcc/rust/hir/tree/rust-hir-pattern.h | 8 |
2 files changed, 17 insertions, 0 deletions
diff --git a/gcc/rust/ast/rust-pattern.h b/gcc/rust/ast/rust-pattern.h index fc587ab..8200b80 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 9bc143d..934a39a 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 ()); |