Move SWIFT_ASSERT_ONLY to Compiler.h

Author: atrick

include/swift/Basic/Compiler.h

@@ -103,4 +103,29 @@
 #define SWIFT_CRASH_BUG_REPORT_MESSAGE \
   "Please " SWIFT_BUG_REPORT_MESSAGE_BASE " and the crash backtrace."
 
+// Conditionally exclude declarations or statements that are only needed for
+// assertions from release builds (NDEBUG) without cluttering the surrounding
+// code by #ifdefs.
+//
+// struct DoThings  {
+//   SWIFT_ASSERT_ONLY_DECL(unsigned verifyCount = 0);
+//   DoThings() {
+//     SWIFT_ASSERT_ONLY(verifyCount = getNumberOfThingsToDo());
+//   }
+//   void doThings() {
+//     do {
+//       // ... do each thing
+//       SWIFT_ASSERT_ONLY(--verifyCount);
+//     } while (!done());
+//     assert(verifyCount == 0 && "did not do everything");
+//   }
+// };
+#ifdef NDEBUG
+#define SWIFT_ASSERT_ONLY_DECL(X)
+#define SWIFT_ASSERT_ONLY(X) do { } while (false)
+#else
+#define SWIFT_ASSERT_ONLY_DECL(X) X
+#define SWIFT_ASSERT_ONLY(X) do { X; } while (false)
+#endif
+
 #endif // SWIFT_BASIC_COMPILER_H

include/swift/SILOptimizer/Utils/PrunedLiveness.h

@@ -90,14 +90,6 @@
 
 #include "swift/SIL/SILBasicBlock.h"
 
-#ifdef NDEBUG
-#define SWIFT_ASSERT_ONLY_MEMBER(X)
-#define SWIFT_ASSERT_ONLY(X) do { } while (false)
-#else
-#define SWIFT_ASSERT_ONLY_MEMBER(X) X
-#define SWIFT_ASSERT_ONLY(X) do { X; } while (false)
-#endif
-
 namespace swift {
 
 /// Discover "pruned" liveness for an arbitrary set of uses. The client builds
@@ -140,7 +132,7 @@ class PrunedLiveBlocks {
   llvm::SmallDenseMap<SILBasicBlock *, bool, 4> liveBlocks;
 
   // Once the first use has been seen, no definitions can be added.
-  SWIFT_ASSERT_ONLY_MEMBER(bool seenUse = false);
+  SWIFT_ASSERT_ONLY_DECL(bool seenUse = false);
 
 public:
   bool empty() const { return liveBlocks.empty(); }