Ensure all code is removed for DCHECK on Windows Official

base/logging.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_LOGGING_H_
 #define BASE_LOGGING_H_
 
 #include <stddef.h>
 
 #include <cassert>
@@ skipping 708 matching lines @@
 #define DCHECK(condition)                                               \
   __analysis_assume(!!(condition)),                                     \
   LAZY_STREAM(LOG_STREAM(DCHECK), false)                                \
   << "Check failed: " #condition ". "
 
 #define DPCHECK(condition)                                              \
   __analysis_assume(!!(condition)),                                     \
   LAZY_STREAM(PLOG_STREAM(DCHECK), false)                               \
   << "Check failed: " #condition ". "
 
-#else  // _PREFAST_
+#else  // _PREFAST_ && OS_WIN
 
-#define DCHECK(condition)                                                \
-  LAZY_STREAM(LOG_STREAM(DCHECK), DCHECK_IS_ON() ? !(condition) : false) \
+#if DCHECK_IS_ON()

[danakj, 2017/01/24 21:10:52]

nested #ifs are such a joy, can u use elif here

+
+#define DCHECK(condition)                       \
+  LAZY_STREAM(LOG_STREAM(DCHECK), !(condition)) \
       << "Check failed: " #condition ". "
 
-#define DPCHECK(condition)                                                \
-  LAZY_STREAM(PLOG_STREAM(DCHECK), DCHECK_IS_ON() ? !(condition) : false) \
+#define DPCHECK(condition)                       \
+  LAZY_STREAM(PLOG_STREAM(DCHECK), !(condition)) \
       << "Check failed: " #condition ". "
 
-#endif  // _PREFAST_
+#else  // DCHECK_IS_ON()
+
+// A separate block (as opposed to a conditional in the LAZY_STREAM) is required
+// to ensure that all code is remove on MSVC. See the comment near
+// EAT_STREAM_PARAMETERS for more detail.
+#define DCHECK(condition) (void)(condition), EAT_STREAM_PARAMETERS
+#define DPCHECK(condition) (void)(condition), EAT_STREAM_PARAMETERS
+
+#endif  // DCHECK_IS_ON()
+
+#endif  // _PREFAST_ && OS_WIN
 
 // Helper macro for binary operators.
 // Don't use this macro directly in your code, use DCHECK_EQ et al below.
 // The 'switch' is used to prevent the 'else' from being ambiguous when the
 // macro is used in an 'if' clause such as:
 // if (a == 1)
 //   DCHECK_EQ(2, a);
 #define DCHECK_OP(name, op, val1, val2)                                \
   switch (0) case 0: default:                                          \
   if (::logging::CheckOpResult true_if_passed =                        \
       DCHECK_IS_ON() ?                                                 \

[danakj, 2017/01/24 21:10:52]

What about these

       ::logging::Check##name##Impl((val1), (val2),                     \
                                    #val1 " " #op " " #val2) : nullptr) \
    ;                                                                   \
   else                                                                 \
     ::logging::LogMessage(__FILE__, __LINE__, ::logging::LOG_DCHECK,   \
                           true_if_passed.message()).stream()
 
 // Equality/Inequality checks - compare two values, and log a
 // LOG_DCHECK message including the two values when the result is not
 // as expected.  The values must have operator<<(ostream, ...)
@@ skipping 257 matching lines @@
 #elif NOTIMPLEMENTED_POLICY == 5
 #define NOTIMPLEMENTED() do {\
   static bool logged_once = false;\
   LOG_IF(ERROR, !logged_once) << NOTIMPLEMENTED_MSG;\
   logged_once = true;\
 } while(0);\
 EAT_STREAM_PARAMETERS
 #endif
 
 #endif  // BASE_LOGGING_H_