- 7f2f6ad0cc3488cb57dfc5d1050c38862a2e42ef Only check for a specific message in the bad_cast tests... by Matt Calabrese <calabrese@google.com>

- 6a8e56df0d6820c48ee8f39146c7e1fba8a394e7 This prevents a uint32_t value from potentially being log... by Matt Calabrese <calabrese@google.com>
  - 00a77f5569086654837c03d06206349642364395 Add doc-comments to `absl::LogSeverity` and its helpers. by Abseil Team <absl-team@google.com>
  - bf877655e420ebff42bede238523d360b53a80fa Enforce the Abseil-wide assumption that CHAR_BIT == 8. by Mark Barolak <mbar@google.com>

GitOrigin-RevId: 7f2f6ad0cc3488cb57dfc5d1050c38862a2e42ef
Change-Id: Id210255c9301442b0379dca147a806c85452f772
This commit is contained in:
Abseil Team 2018-04-03 08:59:15 -07:00 committed by Ashley Hedberg
parent 7b3c38a062
commit 0e5c3e8f16
4 changed files with 46 additions and 6 deletions

View file

@ -152,10 +152,10 @@ void CallOnceImpl(std::atomic<uint32_t>* control,
old_control != kOnceDone) {
ABSL_RAW_LOG(
FATAL,
"Unexpected value for control word: %x. Either the control word "
"Unexpected value for control word: %lx. Either the control word "
"has non-static storage duration (where GoogleOnceDynamic might "
"be appropriate), or there's been a memory corruption.",
static_cast<unsigned>(old_control));
static_cast<unsigned long>(old_control)); // NOLINT
}
}
#endif // NDEBUG

View file

@ -22,6 +22,9 @@
namespace absl {
// Four severity levels are defined. Logging APIs should terminate the program
// when a message is logged at severity `kFatal`; the other levels have no
// special semantics.
enum class LogSeverity : int {
kInfo = 0,
kWarning = 1,
@ -36,6 +39,8 @@ constexpr std::array<absl::LogSeverity, 4> LogSeverities() {
absl::LogSeverity::kError, absl::LogSeverity::kFatal}};
}
// Returns the all-caps std::string representation (e.g. "INFO") of the specified
// severity level if it is one of the normal levels and "UNKNOWN" otherwise.
constexpr const char* LogSeverityName(absl::LogSeverity s) {
return s == absl::LogSeverity::kInfo
? "INFO"
@ -46,7 +51,8 @@ constexpr const char* LogSeverityName(absl::LogSeverity s) {
: s == absl::LogSeverity::kFatal ? "FATAL" : "UNKNOWN";
}
// Note that out-of-range severities normalize to kInfo or kError, never kFatal.
// Values less than `kInfo` normalize to `kInfo`; values greater than `kFatal`
// normalize to `kError` (**NOT** `kFatal`).
constexpr absl::LogSeverity NormalizeLogSeverity(absl::LogSeverity s) {
return s < absl::LogSeverity::kInfo
? absl::LogSeverity::kInfo

View file

@ -47,14 +47,14 @@
// We support MSVC++ 14.0 update 2 and later.
// This minimum will go up.
#if defined(_MSC_FULL_VER) && _MSC_FULL_VER < 190023918 && !defined(__clang__)
#error "This package requires Visual Studio 2015 Update 2 or higher"
#error "This package requires Visual Studio 2015 Update 2 or higher."
#endif
// We support gcc 4.7 and later.
// This minimum will go up.
#if defined(__GNUC__) && !defined(__clang__)
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7)
#error "This package requires gcc 4.7 or higher"
#error "This package requires gcc 4.7 or higher."
#endif
#endif
@ -62,7 +62,7 @@
// This corresponds to Apple Xcode version 4.5.
// This minimum will go up.
#if defined(__apple_build_version__) && __apple_build_version__ < 4211165
#error "This package requires __apple_build_version__ of 4211165 or higher"
#error "This package requires __apple_build_version__ of 4211165 or higher."
#endif
// -----------------------------------------------------------------------------
@ -96,4 +96,26 @@
#error "STLPort is not supported."
#endif
// -----------------------------------------------------------------------------
// `char` Size Check
// -----------------------------------------------------------------------------
// Abseil currently assumes CHAR_BIT == 8. If you would like to use Abseil on a
// platform where this is not the case, please provide us with the details about
// your platform so we can consider relaxing this requirement.
#if CHAR_BIT != 8
#error "Abseil assumes CHAR_BIT == 8."
#endif
// -----------------------------------------------------------------------------
// `int` Size Check
// -----------------------------------------------------------------------------
// Abseil currently assumes that an int is 4 bytes. If you would like to use
// Abseil on a platform where this is not the case, please provide us with the
// details about your platform so we can consider relaxing this requirement.
#if INT_MAX < 2147483647
#error "Abseil assumes that int is at least 4 bytes. "
#endif
#endif // ABSL_BASE_POLICY_CHECKS_H_

View file

@ -587,10 +587,22 @@ TEST(AnyTest, ConversionConstructionCausesOneCopy) {
// Tests for Exception Behavior //
//////////////////////////////////
#if defined(ABSL_HAVE_STD_ANY)
// If using a std `any` implementation, we can't check for a specific message.
#define ABSL_ANY_TEST_EXPECT_BAD_ANY_CAST(...) \
ABSL_BASE_INTERNAL_EXPECT_FAIL((__VA_ARGS__), absl::bad_any_cast, \
"")
#else
// If using the absl `any` implementation, we can rely on a specific message.
#define ABSL_ANY_TEST_EXPECT_BAD_ANY_CAST(...) \
ABSL_BASE_INTERNAL_EXPECT_FAIL((__VA_ARGS__), absl::bad_any_cast, \
"Bad any cast")
#endif // defined(ABSL_HAVE_STD_ANY)
TEST(AnyTest, ThrowBadAlloc) {
{
absl::any a;