ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "logging: always enable DCHECK for the static analyzer" am: 844940d751 am: 539c87b29a

Browse source 
am: 41ed46f9b4

Change-Id: Ie17cd4eee74856f4052425c2fe7480aa9d96fed5
This commit is contained in:
George Burgess IV 2017-05-26 21:31:05 +00:00 • committed by android-build-merger
commit 2b496ca4af
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
base/include/android-base/logging.h
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)