From c7cdae718c24e7a3f68d7090cc9947df5d848fb8 Mon Sep 17 00:00:00 2001 From: Liam Naddell Date: Fri, 19 Jul 2024 14:19:26 -0400 Subject: gccrs: [gccrs#2987] Patch ICE when deriving Clone and Copy gcc/rust/ChangeLog: * expand/rust-expand-visitor.cc: Fix ICE caused by unique_ptr UB and buggy iterator use gcc/testsuite/ChangeLog: * rust/compile/issue-2987.rs: Add test for deriving Clone and Copy at the same time Signed-off-by: Liam Naddell --- gcc/rust/expand/rust-expand-visitor.cc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gcc/rust') diff --git a/gcc/rust/expand/rust-expand-visitor.cc b/gcc/rust/expand/rust-expand-visitor.cc index 61147e2..38399d0d 100644 --- a/gcc/rust/expand/rust-expand-visitor.cc +++ b/gcc/rust/expand/rust-expand-visitor.cc @@ -167,10 +167,10 @@ ExpandVisitor::expand_inner_items ( for (auto it = items.begin (); it != items.end (); it++) { - auto &item = *it; - if (item->has_outer_attrs ()) + Rust::AST::Item &item = **it; + if (item.has_outer_attrs ()) { - auto &attrs = item->get_outer_attrs (); + auto &attrs = item.get_outer_attrs (); for (auto attr_it = attrs.begin (); attr_it != attrs.end (); /* erase => No increment*/) @@ -190,16 +190,17 @@ ExpandVisitor::expand_inner_items ( if (maybe_builtin.has_value ()) { auto new_item - = builtin_derive_item (*item, current, + = builtin_derive_item (item, current, maybe_builtin.value ()); - // this inserts the derive *before* the item - is it a - // problem? + it = items.insert (it, std::move (new_item)); } else { + // Macro is not a builtin, so it must be a + // user-defined derive macro. auto new_items - = derive_item (*item, to_derive, expander); + = derive_item (item, to_derive, expander); std::move (new_items.begin (), new_items.end (), std::inserter (items, it)); } @@ -215,7 +216,7 @@ ExpandVisitor::expand_inner_items ( { attr_it = attrs.erase (attr_it); auto new_items - = expand_item_attribute (*item, current.get_path (), + = expand_item_attribute (item, current.get_path (), expander); it = items.erase (it); std::move (new_items.begin (), new_items.end (), -- cgit v1.1