Merge "logging: always enable DCHECK for the static analyzer"

am: 844940d751

Change-Id: Idf8c288d453ce24769eccb7296fe44b9df683254
This commit is contained in:
George Burgess IV 2017-05-26 21:25:00 +00:00 committed by android-build-merger
commit 539c87b29a
1 changed files with 2 additions and 2 deletions

View File

@ -315,7 +315,7 @@ struct LogAbortAfterFullExpr {
// DCHECKs are debug variants of CHECKs only enabled in debug builds. Generally
// CHECK should be used unless profiling identifies a CHECK as being in
// performance critical code.
#if defined(NDEBUG)
#if defined(NDEBUG) && !defined(__clang_analyzer__)
static constexpr bool kEnableDChecks = false;
#else
static constexpr bool kEnableDChecks = true;
@ -339,7 +339,7 @@ static constexpr bool kEnableDChecks = true;
if (::android::base::kEnableDChecks) CHECK_STREQ(s1, s2)
#define DCHECK_STRNE(s1, s2) \
if (::android::base::kEnableDChecks) CHECK_STRNE(s1, s2)
#if defined(NDEBUG)
#if defined(NDEBUG) && !defined(__clang_analyzer__)
#define DCHECK_CONSTEXPR(x, out, dummy)
#else
#define DCHECK_CONSTEXPR(x, out, dummy) CHECK_CONSTEXPR(x, out, dummy)