Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41ed46f9 authored by George Burgess IV's avatar George Burgess IV Committed by android-build-merger
Browse files

Merge "logging: always enable DCHECK for the static analyzer" am: 844940d7 

am: 539c87b2

Change-Id: I351610d18f877e8b81e7a61a0b26191771671cdf
parents cc0e43c8 539c87b2

base/include/android-base/logging.h

+2 −2
Original line number Diff line number Diff line
@@ -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)