Skip to content

Remove unnecessary field in optional #8720

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

Remove unnecessary field in optional #8720

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
12 changes: 6 additions & 6 deletions runtime/core/portable_type/optional.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,16 @@ class optional final {
using value_type = T;

/// Constructs an optional object that does not contain a value.
/* implicit */ optional() noexcept : storage_(trivial_init), init_(false) {}
/* implicit */ optional() noexcept
: storage_(trivial_init_t{}), init_(false) {}

/// Constructs an optional object that does not contain a value.
/* implicit */ optional(nullopt_t) noexcept
: storage_(trivial_init), init_(false) {}
: storage_(trivial_init_t{}), init_(false) {}

/// Constructs an optional object that matches the state of v.
/* implicit */ optional(const optional<T>& v)
: storage_(trivial_init), init_(v.init_) {
: storage_(trivial_init_t{}), init_(v.init_) {
if (init_) {
new (&storage_.value_) T(v.storage_.value_);
}
Expand All @@ -53,7 +54,7 @@ class optional final {
/// Constructs an optional object from v.
/* implicit */ optional(optional<T>&& v) noexcept(
std::is_nothrow_move_constructible<T>::value)
: storage_(trivial_init), init_(v.init_) {
: storage_(trivial_init_t{}), init_(v.init_) {
if (init_) {
new (&storage_.value_) T(std::forward<T>(v.storage_.value_));
}
Expand Down Expand Up @@ -134,8 +135,7 @@ class optional final {
private:
// Used to invoke the dummy ctor of storage_t in the initializer lists of
// optional_base as default ctor is implicitly deleted because T is nontrivial
struct trivial_init_t {
} trivial_init{};
struct trivial_init_t {};

/**
* A wrapper type that lets us avoid constructing a T when there is no value.
Expand Down
Loading