Delete ASSERT_DISABLED

Source/wtf/Assertions.h

 /*
  * Copyright (C) 2003, 2006, 2007 Apple Inc.  All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 36 matching lines @@
 /* Disable ASSERT* macros in release mode. */
 #define ASSERTIONS_DISABLED_DEFAULT 1
 #else
 #define ASSERTIONS_DISABLED_DEFAULT 0
 #endif
 
 #ifndef BACKTRACE_DISABLED
 #define BACKTRACE_DISABLED ASSERTIONS_DISABLED_DEFAULT
 #endif
 
-#ifndef ASSERT_DISABLED
-#define ASSERT_DISABLED ASSERTIONS_DISABLED_DEFAULT
+#ifndef ASSERT_ENABLED
+// Notice the not below:
+#define ASSERT_ENABLED !ASSERTIONS_DISABLED_DEFAULT
 #endif
-#define ASSERT_ENABLED !ASSERT_DISABLED
 
 #ifndef ASSERT_MSG_DISABLED
 #define ASSERT_MSG_DISABLED ASSERTIONS_DISABLED_DEFAULT
 #endif
 
 #ifndef ASSERT_ARG_DISABLED
 #define ASSERT_ARG_DISABLED ASSERTIONS_DISABLED_DEFAULT
 #endif
 
 #ifndef FATAL_DISABLED
@@ skipping 101 matching lines @@
 /* ASSERT, ASSERT_NOT_REACHED, ASSERT_UNUSED
 
   These macros are compiled out of release builds.
   Expressions inside them are evaluated in debug builds only.
 */
 #if OS(WIN)
 /* FIXME: Change to use something other than ASSERT to avoid this conflict with the underlying platform */
 #undef ASSERT
 #endif
 
-#if ASSERT_DISABLED
-
-#define ASSERT(assertion) ((void)0)
-#define ASSERT_AT(assertion, file, line, function) ((void)0)
-#define ASSERT_NOT_REACHED() ((void)0)
-#define NO_RETURN_DUE_TO_ASSERT
-
-#define ASSERT_UNUSED(variable, assertion) ((void)variable)
-
-#else
+#if ASSERT_ENABLED
 
 #define ASSERT(assertion) \
     (!(assertion) ? \
         (WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, #assertion), \
          CRASH()) : \
         (void)0)
 
 #define ASSERT_AT(assertion, file, line, function) \
     (!(assertion) ? \
         (WTFReportAssertionFailure(file, line, function, #assertion), \
          CRASH()) :                                                   \
         (void)0)
 
 #define ASSERT_NOT_REACHED() do { \
     WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, 0); \
     CRASH(); \
 } while (0)
 
 #define ASSERT_UNUSED(variable, assertion) ASSERT(assertion)
 
 #define NO_RETURN_DUE_TO_ASSERT NO_RETURN_DUE_TO_CRASH
 
+#else
+
+#define ASSERT(assertion) ((void)0)
+#define ASSERT_AT(assertion, file, line, function) ((void)0)
+#define ASSERT_NOT_REACHED() ((void)0)
+#define NO_RETURN_DUE_TO_ASSERT
+
+#define ASSERT_UNUSED(variable, assertion) ((void)variable)
+
 #endif
 
 /* ASSERT_WITH_SECURITY_IMPLICATION / RELEASE_ASSERT_WITH_SECURITY_IMPLICATION
 
    Use in places where failure of the assertion indicates a possible security
    vulnerability. Classes of these vulnerabilities include bad casts, out of
    bounds accesses, use-after-frees, etc. Please be sure to file bugs for these
    failures using the security template:
       http://code.google.com/p/chromium/issues/entry?template=Security%20Bug
 */
@@ skipping 121 matching lines @@
 #endif
 
 /* RELEASE_ASSERT
 
    Use in places where failure of an assertion indicates a definite security
    vulnerability from which execution must not continue even in a release build.
    Please sure to file bugs for these failures using the security template:
       http://code.google.com/p/chromium/issues/entry?template=Security%20Bug
 */
 
-#if ASSERT_DISABLED
+#if ASSERT_ENABLED
+#define RELEASE_ASSERT(assertion) ASSERT(assertion)
+#define RELEASE_ASSERT_WITH_MESSAGE(assertion, ...) ASSERT_WITH_MESSAGE(assertion, __VA_ARGS__)
+#define RELEASE_ASSERT_NOT_REACHED() ASSERT_NOT_REACHED()
+#else
 #define RELEASE_ASSERT(assertion) (UNLIKELY(!(assertion)) ? (IMMEDIATE_CRASH()) : (void)0)
 #define RELEASE_ASSERT_WITH_MESSAGE(assertion, ...) RELEASE_ASSERT(assertion)
 #define RELEASE_ASSERT_NOT_REACHED() IMMEDIATE_CRASH()
-#else
-#define RELEASE_ASSERT(assertion) ASSERT(assertion)
-#define RELEASE_ASSERT_WITH_MESSAGE(assertion, ...) ASSERT_WITH_MESSAGE(assertion, __VA_ARGS__)
-#define RELEASE_ASSERT_NOT_REACHED() ASSERT_NOT_REACHED()
 #endif
 
 /* DEFINE_COMPARISON_OPERATORS_WITH_REFERENCES */
 
 // Allow equality comparisons of Objects by reference or pointer, interchangeably.
 #define DEFINE_COMPARISON_OPERATORS_WITH_REFERENCES(thisType) \
     inline bool operator==(const thisType& a, const thisType& b) { return &a == &b; } \
     inline bool operator==(const thisType& a, const thisType* b) { return &a == b; } \
     inline bool operator==(const thisType* a, const thisType& b) { return a == &b; } \
     inline bool operator!=(const thisType& a, const thisType& b) { return !(a == b); } \
@@ skipping 27 matching lines @@
 } \
 inline const thisType& to##thisType(const argumentType& argumentName) \
 { \
     ASSERT_WITH_SECURITY_IMPLICATION(referencePredicate); \
     return static_cast<const thisType&>(argumentName); \
 } \
 void to##thisType(const thisType*); \
 void to##thisType(const thisType&)
 
 #endif /* WTF_Assertions_h */