Skip to content
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

Jump to bottom

Don't include <cassert>. (#2148) #2152

Merged
merged 5 commits into from
Mar 4, 2021
Merged

Don't include <cassert>. (#2148) #2152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f699d2
Don't include <cassert>. (#2148)
toojays Feb 25, 2021
131e584
FMT_GCC_VERSION is not defined when we include test-assert.h, use __G…
toojays Feb 25, 2021
4471b2f
Don't explicitly suppress GCC's -Wterminate in tests' FMT_ASSERT.
toojays Mar 1, 2021
2f7a6d8
Remove messages from assertions added in 2f699d2.
toojays Mar 1, 2021
0b8276f
Correct formatting around throw_assertion_failure().
toojays Mar 3, 2021
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
15 changes: 7 additions & 8 deletions include/fmt/format-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#define FMT_FORMAT_INL_H_

#include <algorithm>
#include <cassert>
#include <cctype>
#include <climits>
#include <cmath>
Expand Down Expand Up @@ -148,7 +147,7 @@ FMT_FUNC void format_error_code(detail::buffer<char>& out, int error_code,
if (message.size() <= inline_buffer_size - error_code_size)
format_to(it, FMT_STRING("{}{}"), message, SEP);
format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code);
assert(out.size() <= inline_buffer_size);
FMT_ASSERT(out.size() <= inline_buffer_size, "");
}

FMT_FUNC void report_error(format_func func, int error_code,
Expand Down Expand Up @@ -1219,7 +1218,7 @@ struct accumulator {
if (lower < n) ++upper;
}
void operator>>=(int shift) {
assert(shift == 32);
FMT_ASSERT(shift == 32, "");
(void)shift;
lower = (upper << 32) | (lower >> 32);
upper >>= 32;
Expand Down Expand Up @@ -1298,7 +1297,7 @@ class bigint {
public:
bigint() : exp_(0) {}
explicit bigint(uint64_t n) { assign(n); }
~bigint() { assert(bigits_.capacity() <= bigits_capacity); }
~bigint() { FMT_ASSERT(bigits_.capacity() <= bigits_capacity, ""); }

bigint(const bigint&) = delete;
void operator=(const bigint&) = delete;
Expand All @@ -1324,7 +1323,7 @@ class bigint {
int num_bigits() const { return static_cast<int>(bigits_.size()) + exp_; }

FMT_NOINLINE bigint& operator<<=(int shift) {
assert(shift >= 0);
FMT_ASSERT(shift >= 0, "");
exp_ += shift / bigit_bits;
shift %= bigit_bits;
if (shift == 0) return *this;
Expand Down Expand Up @@ -1386,7 +1385,7 @@ class bigint {

// Assigns pow(10, exp) to this bigint.
void assign_pow10(int exp) {
assert(exp >= 0);
FMT_ASSERT(exp >= 0, "");
if (exp == 0) return assign(1);
// Find the top bit.
int bitmask = 1;
Expand Down Expand Up @@ -2557,11 +2556,11 @@ int snprintf_float(T value, int precision, float_specs specs,
--exp_pos;
} while (*exp_pos != 'e');
char sign = exp_pos[1];
assert(sign == '+' || sign == '-');
FMT_ASSERT(sign == '+' || sign == '-', "");
int exp = 0;
auto p = exp_pos + 2; // Skip 'e' and sign.
do {
assert(is_digit(*p));
FMT_ASSERT(is_digit(*p), "");
exp = exp * 10 + (*p++ - '0');
} while (p != end);
if (sign == '-') exp = -exp;
Expand Down
8 changes: 7 additions & 1 deletion test/test-assert.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,14 @@ class assertion_failure : public std::logic_error {

void assertion_failure::avoid_weak_vtable() {}

// We use a separate function (rather than throw directly from FMT_ASSERT) to
// avoid GCC's -Wterminate warning when FMT_ASSERT is used in a destructor.
inline void throw_assertion_failure(const char* message) {
throw assertion_failure(message);
}

#define FMT_ASSERT(condition, message) \
if (!(condition)) throw assertion_failure(message);
if (!(condition)) throw_assertion_failure(message);

// Expects an assertion failure.
#define EXPECT_ASSERT(stmt, message) \
Expand Down