Skip to content

A
abseil-cpp
Commit d659fe54 by Abseil Team Committed by Mark Barolak
Options

Export of internal Abseil changes 

--
c385118b3ef0528d150bfe7aeeb63e77f9e463cd by Matt Calabrese <calabrese@google.com>:

Internal-only Archetype generation for testing generic code with user-defined types of various properties.

PiperOrigin-RevId: 283833099

--
4ccf340d3b295aa5b796ee5c97128b61d38899ea by Derek Mauro <dmauro@google.com>:

Fixes the flags parse_test.
Windows doesn't like consecutive path separators.

PiperOrigin-RevId: 283614649

--
5df6d83acb1e49cd1da785cfaf7551f05149f3c9 by Andy Getzendanner <durandal@google.com>:

ABSL_INTERNAL_LOG: forward complete __FILE__ to internal_log_function; not just basename.

PiperOrigin-RevId: 283406080
GitOrigin-RevId: c385118b3ef0528d150bfe7aeeb63e77f9e463cd
Change-Id: Ib0782354691a73fc40185c3262cfd507085b3393
parent a4b757b5
Showing with 131 additions and 43 deletions
absl/base/internal/raw_logging.h
...@@ -70,14 +70,10 @@ ...@@ -70,14 +70,10 @@
// //
// The API is a subset of the above: each macro only takes two arguments. Use // The API is a subset of the above: each macro only takes two arguments. Use
// StrCat if you need to build a richer message. // StrCat if you need to build a richer message.
#define ABSL_INTERNAL_LOG(severity, message) \ #define ABSL_INTERNAL_LOG(severity, message) \
do { \ do { \
constexpr const char* absl_raw_logging_internal_basename = \ ::absl::raw_logging_internal::internal_log_function( \
::absl::raw_logging_internal::Basename(__FILE__, \ ABSL_RAW_LOGGING_INTERNAL_##severity, __FILE__, __LINE__, message); \
sizeof(__FILE__) - 1); \
::absl::raw_logging_internal::internal_log_function( \
ABSL_RAW_LOGGING_INTERNAL_##severity, \
absl_raw_logging_internal_basename, __LINE__, message); \
} while (0) } while (0)
#define ABSL_INTERNAL_CHECK(condition, message) \ #define ABSL_INTERNAL_CHECK(condition, message) \
......
absl/flags/parse_test.cc
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "absl/base/internal/raw_logging.h" #include "absl/base/internal/raw_logging.h"
#include "absl/base/internal/scoped_set_env.h" #include "absl/base/internal/scoped_set_env.h"
#include "absl/flags/flag.h" #include "absl/flags/flag.h"
#include "absl/strings/match.h"
#include "absl/strings/str_cat.h" #include "absl/strings/str_cat.h"
#include "absl/strings/substitute.h" #include "absl/strings/substitute.h"
#include "absl/types/span.h" #include "absl/types/span.h"
...@@ -92,8 +93,11 @@ const std::string& GetTestTempDir() { ...@@ -92,8 +93,11 @@ const std::string& GetTestTempDir() {
auto len = GetTempPathA(MAX_PATH, temp_path_buffer); auto len = GetTempPathA(MAX_PATH, temp_path_buffer);
if (len < MAX_PATH && len != 0) { if (len < MAX_PATH && len != 0) {
std::string temp_dir_name = absl::StrCat( std::string temp_dir_name = temp_path_buffer;
temp_path_buffer, "\\parse_test.", GetCurrentProcessId()); if (!absl::EndsWith(temp_dir_name, "\\")) {
temp_dir_name.push_back('\\');
}
absl::StrAppend(&temp_dir_name, "parse_test.", GetCurrentProcessId());
if (CreateDirectoryA(temp_dir_name.c_str(), nullptr)) { if (CreateDirectoryA(temp_dir_name.c_str(), nullptr)) {
*res = temp_dir_name; *res = temp_dir_name;
} }
...@@ -104,11 +108,11 @@ const std::string& GetTestTempDir() { ...@@ -104,11 +108,11 @@ const std::string& GetTestTempDir() {
*res = unique_name; *res = unique_name;
} }
#endif #endif
}
if (res->empty()) { if (res->empty()) {
ABSL_INTERNAL_LOG(FATAL, ABSL_INTERNAL_LOG(FATAL,
"Failed to make temporary directory for data files"); "Failed to make temporary directory for data files");
}
} }
#ifdef _WIN32 #ifdef _WIN32
......
absl/meta/type_traits.h
...@@ -41,10 +41,20 @@ ...@@ -41,10 +41,20 @@
#include "absl/base/config.h" #include "absl/base/config.h"
// MSVC constructibility traits do not detect destructor properties and so our
// implementations should not use them as a source-of-truth.
#if defined(_MSC_VER) && !defined(__clang__) && !defined(__GNUC__)
#define ABSL_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION 1
#endif
namespace absl { namespace absl {
// Defined and documented later on in this file. // Defined and documented later on in this file.
template <typename T> template <typename T>
struct is_trivially_destructible;
// Defined and documented later on in this file.
template <typename T>
struct is_trivially_move_assignable; struct is_trivially_move_assignable;
namespace type_traits_internal { namespace type_traits_internal {
...@@ -66,6 +76,20 @@ union SingleMemberUnion { ...@@ -66,6 +76,20 @@ union SingleMemberUnion {
#endif // defined(_MSC_VER) && !defined(__GNUC__) #endif // defined(_MSC_VER) && !defined(__GNUC__)
template <class T> template <class T>
struct IsTriviallyMoveConstructibleObject
: std::integral_constant<
bool, std::is_move_constructible<
type_traits_internal::SingleMemberUnion<T>>::value &&
absl::is_trivially_destructible<T>::value> {};
template <class T>
struct IsTriviallyCopyConstructibleObject
: std::integral_constant<
bool, std::is_copy_constructible<
type_traits_internal::SingleMemberUnion<T>>::value &&
absl::is_trivially_destructible<T>::value> {};
template <class T>
struct IsTriviallyMoveAssignableReference : std::false_type {}; struct IsTriviallyMoveAssignableReference : std::false_type {};
template <class T> template <class T>
...@@ -323,7 +347,9 @@ struct is_trivially_default_constructible ...@@ -323,7 +347,9 @@ struct is_trivially_default_constructible
: std::integral_constant<bool, __has_trivial_constructor(T) && : std::integral_constant<bool, __has_trivial_constructor(T) &&
std::is_default_constructible<T>::value && std::is_default_constructible<T>::value &&
is_trivially_destructible<T>::value> { is_trivially_destructible<T>::value> {
#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE #if defined(ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE) && \
!defined( \
ABSL_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION)
private: private:
static constexpr bool compliant = static constexpr bool compliant =
std::is_trivially_default_constructible<T>::value == std::is_trivially_default_constructible<T>::value ==
...@@ -354,10 +380,11 @@ template <typename T> ...@@ -354,10 +380,11 @@ template <typename T>
struct is_trivially_move_constructible struct is_trivially_move_constructible
: std::conditional< : std::conditional<
std::is_object<T>::value && !std::is_array<T>::value, std::is_object<T>::value && !std::is_array<T>::value,
std::is_move_constructible< type_traits_internal::IsTriviallyMoveConstructibleObject<T>,
type_traits_internal::SingleMemberUnion<T>>,
std::is_reference<T>>::type::type { std::is_reference<T>>::type::type {
#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE #if defined(ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE) && \
!defined( \
ABSL_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION)
private: private:
static constexpr bool compliant = static constexpr bool compliant =
std::is_trivially_move_constructible<T>::value == std::is_trivially_move_constructible<T>::value ==
...@@ -388,10 +415,11 @@ template <typename T> ...@@ -388,10 +415,11 @@ template <typename T>
struct is_trivially_copy_constructible struct is_trivially_copy_constructible
: std::conditional< : std::conditional<
std::is_object<T>::value && !std::is_array<T>::value, std::is_object<T>::value && !std::is_array<T>::value,
std::is_copy_constructible< type_traits_internal::IsTriviallyCopyConstructibleObject<T>,
type_traits_internal::SingleMemberUnion<T>>,
std::is_lvalue_reference<T>>::type::type { std::is_lvalue_reference<T>>::type::type {
#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE #if defined(ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE) && \
!defined( \
ABSL_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION)
private: private:
static constexpr bool compliant = static constexpr bool compliant =
std::is_trivially_copy_constructible<T>::value == std::is_trivially_copy_constructible<T>::value ==
...@@ -423,7 +451,8 @@ struct is_trivially_copy_constructible ...@@ -423,7 +451,8 @@ struct is_trivially_copy_constructible
template <typename T> template <typename T>
struct is_trivially_move_assignable struct is_trivially_move_assignable
: std::conditional< : std::conditional<
std::is_object<T>::value && !std::is_array<T>::value, std::is_object<T>::value && !std::is_array<T>::value &&
std::is_move_assignable<T>::value,
std::is_move_assignable<type_traits_internal::SingleMemberUnion<T>>, std::is_move_assignable<type_traits_internal::SingleMemberUnion<T>>,
type_traits_internal::IsTriviallyMoveAssignableReference<T>>::type:: type_traits_internal::IsTriviallyMoveAssignableReference<T>>::type::
type { type {
......
absl/meta/type_traits_test.cc
...@@ -347,21 +347,6 @@ class Base { ...@@ -347,21 +347,6 @@ class Base {
virtual ~Base() {} virtual ~Base() {}
}; };
// In GCC/Clang, std::is_trivially_constructible requires that the destructor is
// trivial. However, MSVC doesn't require that. This results in different
// behavior when checking is_trivially_constructible on any type with
// nontrivial destructor. Since absl::is_trivially_default_constructible and
// absl::is_trivially_copy_constructible both follows Clang/GCC's interpretation
// and check is_trivially_destructible, it results in inconsistency with
// std::is_trivially_xxx_constructible on MSVC. This macro is used to work
// around this issue in test. In practice, a trivially constructible type
// should also be trivially destructible.
// GCC bug 51452: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=51452
// LWG issue 2116: http://cplusplus.github.io/LWG/lwg-active.html#2116
#ifndef _MSC_VER
#define ABSL_TRIVIALLY_CONSTRUCTIBLE_VERIFY_TRIVIALLY_DESTRUCTIBLE 1
#endif
// Old versions of libc++, around Clang 3.5 to 3.6, consider deleted destructors // Old versions of libc++, around Clang 3.5 to 3.6, consider deleted destructors
// as also being trivial. With the resolution of CWG 1928 and CWG 1734, this // as also being trivial. With the resolution of CWG 1928 and CWG 1734, this
// is no longer considered true and has thus been amended. // is no longer considered true and has thus been amended.
...@@ -499,11 +484,9 @@ TEST(TypeTraitsTest, TestTrivialDefaultCtor) { ...@@ -499,11 +484,9 @@ TEST(TypeTraitsTest, TestTrivialDefaultCtor) {
EXPECT_FALSE( EXPECT_FALSE(
absl::is_trivially_default_constructible<DeletedDefaultCtor>::value); absl::is_trivially_default_constructible<DeletedDefaultCtor>::value);
#ifdef ABSL_TRIVIALLY_CONSTRUCTIBLE_VERIFY_TRIVIALLY_DESTRUCTIBLE
// types with nontrivial destructor are nontrivial // types with nontrivial destructor are nontrivial
EXPECT_FALSE( EXPECT_FALSE(
absl::is_trivially_default_constructible<NontrivialDestructor>::value); absl::is_trivially_default_constructible<NontrivialDestructor>::value);
#endif
// types with vtables // types with vtables
EXPECT_FALSE(absl::is_trivially_default_constructible<Base>::value); EXPECT_FALSE(absl::is_trivially_default_constructible<Base>::value);
...@@ -607,11 +590,9 @@ TEST(TypeTraitsTest, TestTrivialMoveCtor) { ...@@ -607,11 +590,9 @@ TEST(TypeTraitsTest, TestTrivialMoveCtor) {
EXPECT_FALSE( EXPECT_FALSE(
absl::is_trivially_move_constructible<NonCopyableOrMovable>::value); absl::is_trivially_move_constructible<NonCopyableOrMovable>::value);
#ifdef ABSL_TRIVIALLY_CONSTRUCTIBLE_VERIFY_TRIVIALLY_DESTRUCTIBLE
// type with nontrivial destructor are nontrivial move construbtible // type with nontrivial destructor are nontrivial move construbtible
EXPECT_FALSE( EXPECT_FALSE(
absl::is_trivially_move_constructible<NontrivialDestructor>::value); absl::is_trivially_move_constructible<NontrivialDestructor>::value);
#endif
// types with vtables // types with vtables
EXPECT_FALSE(absl::is_trivially_move_constructible<Base>::value); EXPECT_FALSE(absl::is_trivially_move_constructible<Base>::value);
...@@ -682,11 +663,9 @@ TEST(TypeTraitsTest, TestTrivialCopyCtor) { ...@@ -682,11 +663,9 @@ TEST(TypeTraitsTest, TestTrivialCopyCtor) {
EXPECT_FALSE( EXPECT_FALSE(
absl::is_trivially_copy_constructible<NonCopyableOrMovable>::value); absl::is_trivially_copy_constructible<NonCopyableOrMovable>::value);
#ifdef ABSL_TRIVIALLY_CONSTRUCTIBLE_VERIFY_TRIVIALLY_DESTRUCTIBLE
// type with nontrivial destructor are nontrivial copy construbtible // type with nontrivial destructor are nontrivial copy construbtible
EXPECT_FALSE( EXPECT_FALSE(
absl::is_trivially_copy_constructible<NontrivialDestructor>::value); absl::is_trivially_copy_constructible<NontrivialDestructor>::value);
#endif
// types with vtables // types with vtables
EXPECT_FALSE(absl::is_trivially_copy_constructible<Base>::value); EXPECT_FALSE(absl::is_trivially_copy_constructible<Base>::value);
......
absl/types/BUILD.bazel
...@@ -209,6 +209,40 @@ cc_test( ...@@ -209,6 +209,40 @@ cc_test(
) )
cc_library( cc_library(
name = "conformance_testing",
testonly = 1,
hdrs = [
"internal/conformance_aliases.h",
"internal/conformance_archetype.h",
"internal/conformance_profile.h",
],
copts = ABSL_TEST_COPTS,
linkopts = ABSL_DEFAULT_LINKOPTS,
deps = [
"//absl/debugging:demangle_internal",
"//absl/meta:type_traits",
"//absl/strings",
"//absl/utility",
"@com_google_googletest//:gtest",
],
)
cc_test(
name = "conformance_testing_test",
size = "small",
srcs = [
"internal/conformance_testing_test.cc",
],
copts = ABSL_TEST_COPTS,
linkopts = ABSL_DEFAULT_LINKOPTS,
deps = [
":conformance_testing",
"//absl/meta:type_traits",
"@com_google_googletest//:gtest_main",
],
)
cc_library(
name = "variant", name = "variant",
srcs = ["internal/variant.h"], srcs = ["internal/variant.h"],
hdrs = ["variant.h"], hdrs = ["variant.h"],
......
absl/types/CMakeLists.txt
...@@ -240,6 +240,52 @@ absl_cc_test( ...@@ -240,6 +240,52 @@ absl_cc_test(
absl_cc_library( absl_cc_library(
NAME NAME
conformance_testing
HDRS
"internal/conformance_aliases.h"
"internal/conformance_archetype.h"
"internal/conformance_profile.h"
COPTS
${ABSL_DEFAULT_COPTS}
DEPS
absl::debugging
absl::type_traits
absl::strings
absl::utility
gmock_main
PUBLIC
)
absl_cc_test(
NAME
conformance_testing_test
SRCS
"internal/conformance_testing_test.cc"
COPTS
${ABSL_TEST_COPTS}
${ABSL_EXCEPTIONS_FLAG}
LINKOPTS
${ABSL_EXCEPTIONS_FLAG_LINKOPTS}
DEPS
absl::conformance_testing
absl::type_traits
gmock_main
)
absl_cc_test(
NAME
conformance_testing_test_no_exceptions
SRCS
"internal/conformance_testing_test.cc"
COPTS
${ABSL_TEST_COPTS}
DEPS
absl::conformance_testing
gmock_main
)
absl_cc_library(
NAME
variant variant
HDRS HDRS
"variant.h" "variant.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment