Add Windows to supported platforms PiperOrigin-RevId: 1023539891
diff --git a/absl/status/statusor.h b/absl/status/statusor.h index e54c61b..d9db61f 100644 --- a/absl/status/statusor.h +++ b/absl/status/statusor.h
@@ -60,6 +60,16 @@ #include "absl/types/variant.h" #include "absl/utility/utility.h" +#if defined(_MSC_VER) && !defined(__NVCC__) +// absl::StatusOr<T> has several empty base classes. By default the Microsoft +// C++ ABI allocates storage for some of them, which makes +// sizeof(absl::StatusOr<T>) larger than under every other ABI. This declspec +// makes the empty base classes take up no storage +#define ABSL_INTERNAL_STATUSOR_DECLSPEC __declspec(empty_bases) +#else +#define ABSL_INTERNAL_STATUSOR_DECLSPEC +#endif + namespace absl { ABSL_NAMESPACE_BEGIN #ifndef SWIG @@ -197,12 +207,13 @@ // return Foo(arg); // } template <typename T> -class StatusOr : private internal_statusor::OperatorBase<T>, - private internal_statusor::StatusOrData<T>, - private internal_statusor::CopyCtorBase<T>, - private internal_statusor::MoveCtorBase<T>, - private internal_statusor::CopyAssignBase<T>, - private internal_statusor::MoveAssignBase<T> { +class ABSL_INTERNAL_STATUSOR_DECLSPEC StatusOr + : private internal_statusor::OperatorBase<T>, + private internal_statusor::StatusOrData<T>, + private internal_statusor::CopyCtorBase<T>, + private internal_statusor::MoveCtorBase<T>, + private internal_statusor::CopyAssignBase<T>, + private internal_statusor::MoveAssignBase<T> { #ifndef SWIG static_assert(!std::is_rvalue_reference_v<T>, "rvalue references are not yet supported."); @@ -808,4 +819,6 @@ ABSL_NAMESPACE_END } // namespace absl +#undef ABSL_INTERNAL_STATUSOR_DECLSPEC + #endif // ABSL_STATUS_STATUSOR_H_
diff --git a/absl/status/statusor_test.cc b/absl/status/statusor_test.cc index 2754d7b..cc16411 100644 --- a/absl/status/statusor_test.cc +++ b/absl/status/statusor_test.cc
@@ -123,6 +123,45 @@ static_assert(std::is_same<absl::StatusOr<char>::value_type, char>()); } +// absl::StatusOr<T> alias +template <typename T> +struct StatusAndValue { + absl::Status status; + T value; +}; + +template <typename T> +constexpr bool HasLayoutOfStatusAndValue() { + return sizeof(absl::StatusOr<T>) == sizeof(StatusAndValue<T>) && + alignof(absl::StatusOr<T>) == alignof(StatusAndValue<T>); +} + +struct EmptyValue {}; + +struct alignas(64) OverAlignedValue { + char c; +}; + +TEST(StatusOr, Layout) { + // The empty base classes of absl::StatusOr<T> must not take up any + // storage. Under the Microsoft C++ ABI this needs __declspec(empty_bases) + static_assert(HasLayoutOfStatusAndValue<char>()); + static_assert(HasLayoutOfStatusAndValue<int>()); + static_assert(HasLayoutOfStatusAndValue<double>()); + static_assert(HasLayoutOfStatusAndValue<void*>()); + static_assert(HasLayoutOfStatusAndValue<std::string>()); + // Not copyable + static_assert(HasLayoutOfStatusAndValue<std::unique_ptr<int>>()); + // Copyable, not assignable + static_assert(HasLayoutOfStatusAndValue<CopyNoAssign>()); + // Reference + static_assert(HasLayoutOfStatusAndValue<int&>()); + // Empty class + static_assert(HasLayoutOfStatusAndValue<EmptyValue>()); + // Over-aligned class + static_assert(HasLayoutOfStatusAndValue<OverAlignedValue>()); +} + TEST(StatusOr, TestMoveOnlyInitialization) { absl::StatusOr<std::unique_ptr<int>> thing(ReturnUniquePtr()); ASSERT_TRUE(thing.ok());