Skip to content

Result/Option: avoid generating calls to missing move-assignment operator #870

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

Merged
copybara-service merged 1 commit into from
Apr 20, 2026
Merged

Result/Option: avoid generating calls to missing move-assignment operator #870

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
8 changes: 5 additions & 3 deletions cc_bindings_from_rs/generate_bindings/generate_template_specialization.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ impl<'tcx> OptionApiGenerator<'_, 'tcx> {
} __NEWLINE__
inline rs_std::Option<#arg_ty>& rs_std::Option<#arg_ty>::operator=(#arg_ty&& value) noexcept {
if (tag() != #none_val) {
*#some_ptr_val = ::std::move(value);
::crubit::MoveAssignOrDestroyAndConstruct(#some_ptr_val, ::std::move(value));
} else {
#write_some_to_tag
::std::construct_at(#some_ptr_val, ::std::move(value));
Expand Down Expand Up @@ -358,6 +358,7 @@ impl<'tcx> OptionApiGenerator<'_, 'tcx> {
let mut prereqs = CcPrerequisites::default();
// For std::move.
prereqs.includes.insert(CcInclude::utility());
prereqs.includes.insert(self.db.support_header("internal/move_assign.h"));
let tag_method_cc_details = tag_method.cc_details.into_tokens(&mut prereqs);
let cc_details = CcSnippet {
tokens: quote! {
Expand Down Expand Up @@ -555,7 +556,7 @@ impl<'tcx> ResultApiGenerator<'_, 'tcx> {
::std::construct_at(#ok_ptr, ::std::move(ok));
} else {
#write_ok_to_tag
*#ok_ptr = ::std::move(ok);
::crubit::MoveAssignOrDestroyAndConstruct(#ok_ptr, ::std::move(ok));
}
return *this;
} __NEWLINE__
Expand Down Expand Up @@ -595,7 +596,7 @@ impl<'tcx> ResultApiGenerator<'_, 'tcx> {
::std::construct_at(#err_ptr, ::std::move(err.error()));
} else {
#write_err_to_tag
*#err_ptr = ::std::move(err.error());
::crubit::MoveAssignOrDestroyAndConstruct(#err_ptr, ::std::move(err.error()));
}
return *this;
} __NEWLINE__
Expand Down Expand Up @@ -662,6 +663,7 @@ impl<'tcx> ResultApiGenerator<'_, 'tcx> {
let mut prereqs = CcPrerequisites::default();
prereqs.includes.insert(CcInclude::utility());
prereqs.includes.insert(db.support_header("internal/check.h"));
prereqs.includes.insert(db.support_header("internal/move_assign.h"));
prereqs.includes.insert(CcInclude::cstring());
let move_construct_ok_details = move_constructor_ok.cc_details.into_tokens(&mut prereqs);
let move_construct_err_details = move_constructor_err.cc_details.into_tokens(&mut prereqs);
Expand Down
28 changes: 18 additions & 10 deletions cc_bindings_from_rs/test/enums/option_cc_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "support/annotations_internal.h"
#include "support/bridge.h"
#include "support/internal/memswap.h"
#include "support/internal/move_assign.h"
#include "support/internal/slot.h"
#include "support/lifetime_annotations.h"
#include "support/rs_std/option.h"
Expand Down Expand Up @@ -1396,8 +1397,9 @@ inline rs_std::Option<::option::CloneNoDefault>&
rs_std::Option<::option::CloneNoDefault>::operator=(
::option::CloneNoDefault&& value) noexcept {
if (tag() != 0) {
*reinterpret_cast<::option::CloneNoDefault*>(storage_ + 1) =
::std::move(value);
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::option::CloneNoDefault*>(storage_ + 1),
::std::move(value));
} else {
set_tag(1);
::std::construct_at(
Expand Down Expand Up @@ -1521,8 +1523,9 @@ inline rs_std::Option<::option::CopyNoDefault>&
rs_std::Option<::option::CopyNoDefault>::operator=(
::option::CopyNoDefault&& value) noexcept {
if (tag() != 0) {
*reinterpret_cast<::option::CopyNoDefault*>(storage_ + 1) =
::std::move(value);
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::option::CopyNoDefault*>(storage_ + 1),
::std::move(value));
} else {
set_tag(1);
::std::construct_at(
Expand Down Expand Up @@ -1642,7 +1645,8 @@ inline rs_std::Option<::option::HasDefault>::Option(
inline rs_std::Option<::option::HasDefault>& rs_std::Option<
::option::HasDefault>::operator=(::option::HasDefault&& value) noexcept {
if (tag() != UINT64_C(9223372036854775808)) {
*reinterpret_cast<::option::HasDefault*>(storage_) = ::std::move(value);
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::option::HasDefault*>(storage_), ::std::move(value));
} else {
::std::construct_at(reinterpret_cast<::option::HasDefault*>(storage_),
::std::move(value));
Expand Down Expand Up @@ -1860,7 +1864,8 @@ inline rs_std::Option<::option::HasOptions>::Option(
inline rs_std::Option<::option::HasOptions>& rs_std::Option<
::option::HasOptions>::operator=(::option::HasOptions&& value) noexcept {
if (tag() != 2) {
*reinterpret_cast<::option::HasOptions*>(storage_) = ::std::move(value);
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::option::HasOptions*>(storage_), ::std::move(value));
} else {
::std::construct_at(reinterpret_cast<::option::HasOptions*>(storage_),
::std::move(value));
Expand Down Expand Up @@ -1969,7 +1974,8 @@ inline rs_std::Option<::option::NonMaxU8>::Option(
inline rs_std::Option<::option::NonMaxU8>& rs_std::Option<
::option::NonMaxU8>::operator=(::option::NonMaxU8&& value) noexcept {
if (tag() != 251) {
*reinterpret_cast<::option::NonMaxU8*>(storage_) = ::std::move(value);
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::option::NonMaxU8*>(storage_), ::std::move(value));
} else {
::std::construct_at(reinterpret_cast<::option::NonMaxU8*>(storage_),
::std::move(value));
Expand Down Expand Up @@ -2082,8 +2088,9 @@ inline rs_std::Option<rs_std::Option<::option::NonMaxU8>>&
rs_std::Option<rs_std::Option<::option::NonMaxU8>>::operator=(
rs_std::Option<::option::NonMaxU8>&& value) noexcept {
if (tag() != 252) {
*reinterpret_cast<rs_std::Option<::option::NonMaxU8>*>(storage_) =
::std::move(value);
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<rs_std::Option<::option::NonMaxU8>*>(storage_),
::std::move(value));
} else {
::std::construct_at(
reinterpret_cast<rs_std::Option<::option::NonMaxU8>*>(storage_),
Expand Down Expand Up @@ -2201,7 +2208,8 @@ inline rs_std::Option<::std::uint8_t>::Option(::std::uint8_t&& value) noexcept {
inline rs_std::Option<::std::uint8_t>&
rs_std::Option<::std::uint8_t>::operator=(::std::uint8_t&& value) noexcept {
if (tag() != 0) {
*reinterpret_cast<::std::uint8_t*>(storage_ + 1) = ::std::move(value);
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::std::uint8_t*>(storage_ + 1), ::std::move(value));
} else {
set_tag(1);
::std::construct_at(reinterpret_cast<::std::uint8_t*>(storage_ + 1),
Expand Down
97 changes: 61 additions & 36 deletions cc_bindings_from_rs/test/enums/result_cc_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "support/annotations_internal.h"
#include "support/internal/check.h"
#include "support/internal/memswap.h"
#include "support/internal/move_assign.h"
#include "support/internal/slot.h"
#include "support/lifetime_annotations.h"
#include "support/rs_std/result.h"
Expand Down Expand Up @@ -1450,8 +1451,9 @@ rs_std::Result<::result::CloneNoDefault, ::std::uint8_t>::operator=(
::std::move(ok));
} else {
set_tag(0);
*reinterpret_cast<::result::CloneNoDefault*>(__storage + 1) =
::std::move(ok);
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::result::CloneNoDefault*>(__storage + 1),
::std::move(ok));
}
return *this;
}
Expand All @@ -1472,8 +1474,9 @@ rs_std::Result<::result::CloneNoDefault, ::std::uint8_t>::operator=(
::std::move(err.error()));
} else {
set_tag(1);
*reinterpret_cast<::std::uint8_t*>(__storage + 1) =
::std::move(err.error());
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::std::uint8_t*>(__storage + 1),
::std::move(err.error()));
}
return *this;
}
Expand Down Expand Up @@ -1575,8 +1578,9 @@ rs_std::Result<::result::CopyNoDefault, ::std::uint8_t>::operator=(
::std::move(ok));
} else {
set_tag(0);
*reinterpret_cast<::result::CopyNoDefault*>(__storage + 1) =
::std::move(ok);
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::result::CopyNoDefault*>(__storage + 1),
::std::move(ok));
}
return *this;
}
Expand All @@ -1597,8 +1601,9 @@ rs_std::Result<::result::CopyNoDefault, ::std::uint8_t>::operator=(
::std::move(err.error()));
} else {
set_tag(1);
*reinterpret_cast<::std::uint8_t*>(__storage + 1) =
::std::move(err.error());
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::std::uint8_t*>(__storage + 1),
::std::move(err.error()));
}
return *this;
}
Expand Down Expand Up @@ -1688,7 +1693,8 @@ rs_std::Result<::result::HasDefault, ::std::uint8_t>::operator=(
::std::construct_at(reinterpret_cast<::result::HasDefault*>(__storage),
::std::move(ok));
} else {
*reinterpret_cast<::result::HasDefault*>(__storage) = ::std::move(ok);
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::result::HasDefault*>(__storage), ::std::move(ok));
}
return *this;
}
Expand All @@ -1709,8 +1715,9 @@ rs_std::Result<::result::HasDefault, ::std::uint8_t>::operator=(
::std::move(err.error()));
} else {
set_tag(UINT64_C(9223372036854775808));
*reinterpret_cast<::std::uint8_t*>(__storage + 8) =
::std::move(err.error());
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::std::uint8_t*>(__storage + 8),
::std::move(err.error()));
}
return *this;
}
Expand Down Expand Up @@ -1808,8 +1815,9 @@ rs_std::Result<::result::HasNoDefault, ::std::uint8_t>::operator=(
::std::move(err.error()));
} else {
set_tag(UINT64_C(9223372036854775808));
*reinterpret_cast<::std::uint8_t*>(__storage + 8) =
::std::move(err.error());
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::std::uint8_t*>(__storage + 8),
::std::move(err.error()));
}
return *this;
}
Expand Down Expand Up @@ -1922,8 +1930,10 @@ operator=(rs_std::Result<::std::uint32_t, ::std::uint32_t>&& ok) noexcept {
__storage),
::std::move(ok));
} else {
*reinterpret_cast<rs_std::Result<::std::uint32_t, ::std::uint32_t>*>(
__storage) = ::std::move(ok);
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<rs_std::Result<::std::uint32_t, ::std::uint32_t>*>(
__storage),
::std::move(ok));
}
return *this;
}
Expand All @@ -1947,8 +1957,9 @@ rs_std::Result<rs_std::Result<::std::uint32_t, ::std::uint32_t>,
::std::move(err.error()));
} else {
set_tag(2);
*reinterpret_cast<::std::uint32_t*>(__storage + 4) =
::std::move(err.error());
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::std::uint32_t*>(__storage + 4),
::std::move(err.error()));
}
return *this;
}
Expand Down Expand Up @@ -2070,7 +2081,8 @@ operator=(::std::uint32_t&& ok) noexcept {
::std::move(ok));
} else {
set_tag(2);
*reinterpret_cast<::std::uint32_t*>(__storage + 4) = ::std::move(ok);
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::std::uint32_t*>(__storage + 4), ::std::move(ok));
}
return *this;
}
Expand Down Expand Up @@ -2098,8 +2110,10 @@ operator=(rs_std::unexpected<rs_std::Result<::std::uint32_t, ::std::uint32_t>>&&
__storage),
::std::move(err.error()));
} else {
*reinterpret_cast<rs_std::Result<::std::uint32_t, ::std::uint32_t>*>(
__storage) = ::std::move(err.error());
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<rs_std::Result<::std::uint32_t, ::std::uint32_t>*>(
__storage),
::std::move(err.error()));
}
return *this;
}
Expand Down Expand Up @@ -2234,7 +2248,8 @@ rs_std::Result<::std::uint8_t, ::result::CloneNoDefault>::operator=(
::std::move(ok));
} else {
set_tag(0);
*reinterpret_cast<::std::uint8_t*>(__storage + 1) = ::std::move(ok);
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::std::uint8_t*>(__storage + 1), ::std::move(ok));
}
return *this;
}
Expand All @@ -2257,8 +2272,9 @@ rs_std::Result<::std::uint8_t, ::result::CloneNoDefault>::operator=(
::std::move(err.error()));
} else {
set_tag(1);
*reinterpret_cast<::result::CloneNoDefault*>(__storage + 1) =
::std::move(err.error());
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::result::CloneNoDefault*>(__storage + 1),
::std::move(err.error()));
}
return *this;
}
Expand Down Expand Up @@ -2360,7 +2376,8 @@ rs_std::Result<::std::uint8_t, ::result::CopyNoDefault>::operator=(
::std::move(ok));
} else {
set_tag(0);
*reinterpret_cast<::std::uint8_t*>(__storage + 1) = ::std::move(ok);
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::std::uint8_t*>(__storage + 1), ::std::move(ok));
}
return *this;
}
Expand All @@ -2382,8 +2399,9 @@ rs_std::Result<::std::uint8_t, ::result::CopyNoDefault>::operator=(
::std::move(err.error()));
} else {
set_tag(1);
*reinterpret_cast<::result::CopyNoDefault*>(__storage + 1) =
::std::move(err.error());
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::result::CopyNoDefault*>(__storage + 1),
::std::move(err.error()));
}
return *this;
}
Expand Down Expand Up @@ -2476,7 +2494,8 @@ rs_std::Result<::std::uint8_t, ::result::HasDefault>::operator=(
::std::move(ok));
} else {
set_tag(UINT64_C(9223372036854775808));
*reinterpret_cast<::std::uint8_t*>(__storage + 8) = ::std::move(ok);
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::std::uint8_t*>(__storage + 8), ::std::move(ok));
}
return *this;
}
Expand All @@ -2494,8 +2513,9 @@ rs_std::Result<::std::uint8_t, ::result::HasDefault>::operator=(
::std::construct_at(reinterpret_cast<::result::HasDefault*>(__storage),
::std::move(err.error()));
} else {
*reinterpret_cast<::result::HasDefault*>(__storage) =
::std::move(err.error());
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::result::HasDefault*>(__storage),
::std::move(err.error()));
}
return *this;
}
Expand Down Expand Up @@ -2592,7 +2612,8 @@ rs_std::Result<::std::uint8_t, ::result::HasNoDefault>::operator=(
::std::move(ok));
} else {
set_tag(UINT64_C(9223372036854775808));
*reinterpret_cast<::std::uint8_t*>(__storage + 8) = ::std::move(ok);
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::std::uint8_t*>(__storage + 8), ::std::move(ok));
}
return *this;
}
Expand Down Expand Up @@ -2697,7 +2718,8 @@ rs_std::Result<::std::uint32_t, ::std::uint32_t>::operator=(
::std::move(ok));
} else {
set_tag(0);
*reinterpret_cast<::std::uint32_t*>(__storage + 4) = ::std::move(ok);
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::std::uint32_t*>(__storage + 4), ::std::move(ok));
}
return *this;
}
Expand All @@ -2718,8 +2740,9 @@ rs_std::Result<::std::uint32_t, ::std::uint32_t>::operator=(
::std::move(err.error()));
} else {
set_tag(1);
*reinterpret_cast<::std::uint32_t*>(__storage + 4) =
::std::move(err.error());
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::std::uint32_t*>(__storage + 4),
::std::move(err.error()));
}
return *this;
}
Expand Down Expand Up @@ -2816,7 +2839,8 @@ inline rs_std::Result<::std::uint8_t, ::std::uint8_t>& rs_std::Result<
::std::move(ok));
} else {
set_tag(0);
*reinterpret_cast<::std::uint8_t*>(__storage + 1) = ::std::move(ok);
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::std::uint8_t*>(__storage + 1), ::std::move(ok));
}
return *this;
}
Expand All @@ -2837,8 +2861,9 @@ rs_std::Result<::std::uint8_t, ::std::uint8_t>::operator=(
::std::move(err.error()));
} else {
set_tag(1);
*reinterpret_cast<::std::uint8_t*>(__storage + 1) =
::std::move(err.error());
::crubit::MoveAssignOrDestroyAndConstruct(
reinterpret_cast<::std::uint8_t*>(__storage + 1),
::std::move(err.error()));
}
return *this;
}
Expand Down
Loading
Loading