From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 124903858D28; Sun, 5 Mar 2023 11:41:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 124903858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678016464; bh=OeTaMK0k3XWOvuFK5JmpOIuPTFzTm8A8AO31ajhoSds=; h=From:To:Subject:Date:From; b=gEXwB5rbSPdED3RlelNz/qGB2M559ea25OigqY6BE72rN2HpdIjzDXVE65kYAvGdo UFmjAazNFlntxz5Fvm7qeVVTqtQrEHF3uL+g5tKPxlHTkHU+u+3pt1yCi9MouH1a7O qPFR/lkiMsJBPnmzUKbjyJK37uWcp+ieIp54j0Oo= 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] Fix assignment operator overloads for AST and HIR patterns X-Act-Checkin: gcc X-Git-Author: Owen Avery X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 193c21c85b4b3f603b1b6280779c758d35570446 X-Git-Newrev: 9dce6f995c2b3bc021a97872b413807de7d294b1 Message-Id: <20230305114104.124903858D28@sourceware.org> Date: Sun, 5 Mar 2023 11:41:04 +0000 (GMT) List-Id: https://gcc.gnu.org/g:9dce6f995c2b3bc021a97872b413807de7d294b1 commit 9dce6f995c2b3bc021a97872b413807de7d294b1 Author: Owen Avery 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 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 ());