projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a race in Observable context destruction
[folly.git]
/
folly
/
SafeAssert.h
diff --git
a/folly/SafeAssert.h
b/folly/SafeAssert.h
index 2c173d6c6fdcb187d9cc85efa07eed968e6007a8..27293c9c5dd5287e909cbdfd2255202152f746dc 100644
(file)
--- a/
folly/SafeAssert.h
+++ b/
folly/SafeAssert.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 201
4
Facebook, Inc.
+ * Copyright 201
7
Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-14,40
+14,36
@@
* limitations under the License.
*/
* limitations under the License.
*/
-#ifndef FOLLY_SAFEASSERT_H_
-#define FOLLY_SAFEASSERT_H_
+#pragma once
-#include
"folly/Portability.h"
-#include
"folly/Preprocessor.h"
+#include
<folly/Portability.h>
+#include
<folly/Preprocessor.h>
/**
* Verify that the expression is true. If not, prints an error message
* (containing msg) to stderr and abort()s. Just like CHECK(), but only
* logs to stderr and only does async-signal-safe calls.
*/
/**
* Verify that the expression is true. If not, prints an error message
* (containing msg) to stderr and abort()s. Just like CHECK(), but only
* logs to stderr and only does async-signal-safe calls.
*/
-#define FOLLY_SAFE_CHECK
(expr
, msg) \
+#define FOLLY_SAFE_CHECK
_IMPL(expr, expr_s
, msg) \
((expr) ? static_cast<void>(0) : \
::folly::detail::assertionFailure( \
((expr) ? static_cast<void>(0) : \
::folly::detail::assertionFailure( \
- FB_STRINGIZE(expr), (msg), __FILE__, __LINE__, __PRETTY_FUNCTION__))
+ FB_STRINGIZE(expr_s), (msg), __FILE__, __LINE__, __PRETTY_FUNCTION__))
+#define FOLLY_SAFE_CHECK(expr, msg) FOLLY_SAFE_CHECK_IMPL((expr), (expr), (msg))
/**
* In debug mode, verify that the expression is true. Otherwise, do nothing
/**
* In debug mode, verify that the expression is true. Otherwise, do nothing
- * (do not even evaluate expr). Just like
assert() or DCHECK(), but only
- *
logs to stderr and
only does async-signal-safe calls.
+ * (do not even evaluate expr). Just like
DCHECK(), but only logs to stderr and
+ * only does async-signal-safe calls.
*/
*/
-#ifdef NDEBUG
-#define FOLLY_SAFE_DCHECK(expr, msg) (static_cast<void>(0))
-#else
-#define FOLLY_SAFE_DCHECK FOLLY_SAFE_CHECK
-#endif
+#define FOLLY_SAFE_DCHECK(expr, msg) \
+ FOLLY_SAFE_CHECK_IMPL(!folly::kIsDebug || (expr), (expr), (msg))
namespace folly { namespace detail {
namespace folly { namespace detail {
-void assertionFailure(const char* expr, const char* msg, const char* file,
- unsigned int line, const char* function)
- FOLLY_NORETURN;
-
+[[noreturn]] void assertionFailure(
+ const char* expr,
+ const char* msg,
+ const char* file,
+ unsigned int line,
+ const char* function);
}} // namespace folly
}} // namespace folly
-
-#endif /* FOLLY_SAFEASSERT_H_ */
-