Skip to content

Fix copy construction and assignment of Pieces #4068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix copy construction and assignment of Pieces #4068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions gcc/rust/ast/rust-fmt.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,24 +49,26 @@ Pieces::collect (const std::string &to_parse, bool append_newline,

Pieces::~Pieces () { ffi::destroy_pieces (handle); }

Pieces::Pieces (const Pieces &other) : pieces_vector (other.pieces_vector)
Pieces::Pieces (const Pieces &other) : handle (ffi::clone_pieces (other.handle))
{
handle = ffi::clone_pieces (other.handle);
// reconstruct
pieces_vector = std::vector<ffi::Piece> (handle.piece_slice.base_ptr,
handle.piece_slice.base_ptr
+ handle.piece_slice.len);
}

Pieces &
Pieces::operator= (const Pieces &other)
{
handle = ffi::clone_pieces (other.handle);
pieces_vector = other.pieces_vector;

// reconstruct
pieces_vector = std::vector<ffi::Piece> (handle.piece_slice.base_ptr,
handle.piece_slice.base_ptr
+ handle.piece_slice.len);

return *this;
}

Pieces::Pieces (Pieces &&other)
: pieces_vector (std::move (other.pieces_vector)),
handle (clone_pieces (other.handle))
{}

} // namespace Fmt
} // namespace Rust
2 changes: 0 additions & 2 deletions gcc/rust/ast/rust-fmt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,6 @@ struct Pieces
Pieces (const Pieces &other);
Pieces &operator= (const Pieces &other);

Pieces (Pieces &&other);

const std::vector<ffi::Piece> &get_pieces () const { return pieces_vector; }

// {
Expand Down
Loading