[NFC] Moved SmallBitVector dumping to Basic.

Moved out of MemoryLocations.h and merged the implementations of <<,
keeping the version from MemoryLocations with its brackets and commas
available via a flag but defaulting the implementation previously in the
header.

Author: nate-chandler

include/swift/Basic/SmallBitVector.h

@@ -16,15 +16,19 @@
 #include "llvm/ADT/SmallBitVector.h"
 #include "llvm/Support/raw_ostream.h"
 
-namespace llvm {
+namespace swift {
 
-inline llvm::raw_ostream &operator<<(llvm::raw_ostream &os,
-                                     const SmallBitVector &bv) {
-  for (unsigned i = 0, e = bv.size(); i != e; ++i)
-    os << (bv[i] ? '1' : '0');
-  return os;
+void printBitsAsArray(llvm::raw_ostream &OS, const llvm::SmallBitVector &bits,
+                      bool bracketed);
+
+inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
+                                     const llvm::SmallBitVector &bits) {
+  printBitsAsArray(OS, bits, /*bracketed=*/false);
+  return OS;
 }
 
-} // namespace llvm
+void dumpBits(const llvm::SmallBitVector &bits);
+
+} // namespace swift
 
 #endif

include/swift/SIL/MemoryLocations.h

@@ -29,16 +29,6 @@ class SILFunction;
 class SILBasicBlock;
 class SingleValueInstruction;
 
-void printBitsAsArray(llvm::raw_ostream &OS, const SmallBitVector &bits);
-
-inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
-                                     const SmallBitVector &bits) {
-  printBitsAsArray(OS, bits);
-  return OS;
-}
-
-void dumpBits(const SmallBitVector &bits);
-
 /// The MemoryLocations utility provides functions to analyze memory locations.
 ///
 /// Memory locations are limited to addresses which are guaranteed to

lib/Basic/CMakeLists.txt

@@ -67,6 +67,7 @@ add_swift_host_library(swiftBasic STATIC
   Program.cpp
   QuotedString.cpp
   Sandbox.cpp
+  SmallBitVector.cpp
   SourceLoc.cpp
   StableHasher.cpp
   Statistic.cpp

lib/Basic/SmallBitVector.cpp

@@ -0,0 +1,34 @@
+//===--- SmallBitVector.cpp -----------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2022 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#include "swift/Basic/SmallBitVector.h"
+#include "llvm/Support/Debug.h"
+
+using namespace llvm;
+
+/// Debug dump a location bit vector.
+void swift::printBitsAsArray(raw_ostream &OS, const SmallBitVector &bits,
+                             bool bracketed) {
+  if (!bracketed) {
+    for (unsigned i = 0, e = bits.size(); i != e; ++i)
+      OS << (bits[i] ? '1' : '0');
+  }
+  const char *separator = "";
+  OS << '[';
+  for (int idx = bits.find_first(); idx >= 0; idx = bits.find_next(idx)) {
+    OS << separator << idx;
+    separator = ",";
+  }
+  OS << ']';
+}
+
+void swift::dumpBits(const SmallBitVector &bits) { dbgs() << bits << '\n'; }

lib/SIL/Utils/BitDataflow.cpp

@@ -12,9 +12,10 @@
 
 #define DEBUG_TYPE "bit-dataflow"
 #include "swift/SIL/BitDataflow.h"
+#include "swift/Basic/SmallBitVector.h"
+#include "swift/SIL/MemoryLocations.h"
 #include "swift/SIL/SILBasicBlock.h"
 #include "swift/SIL/SILFunction.h"
-#include "swift/SIL/MemoryLocations.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace swift;

lib/SIL/Utils/MemoryLocations.cpp

@@ -12,29 +12,15 @@
 
 #define DEBUG_TYPE "sil-memory-locations"
 #include "swift/SIL/MemoryLocations.h"
+#include "swift/Basic/SmallBitVector.h"
+#include "swift/SIL/ApplySite.h"
 #include "swift/SIL/SILBasicBlock.h"
 #include "swift/SIL/SILFunction.h"
-#include "swift/SIL/ApplySite.h"
 #include "swift/SIL/SILModule.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace swift;
 
-/// Debug dump a location bit vector.
-void swift::printBitsAsArray(llvm::raw_ostream &OS, const SmallBitVector &bits) {
-  const char *separator = "";
-  OS << '[';
-  for (int idx = bits.find_first(); idx >= 0; idx = bits.find_next(idx)) {
-    OS << separator << idx;
-    separator = ",";
-  }
-  OS << ']';
-}
-
-void swift::dumpBits(const SmallBitVector &bits) {
-  llvm::dbgs() << bits << '\n';
-}
-
 namespace swift {
 namespace {
 

lib/SILOptimizer/Analysis/RegionAnalysis.cpp

@@ -20,6 +20,7 @@
 #include "swift/AST/Type.h"
 #include "swift/Basic/FrozenMultiMap.h"
 #include "swift/Basic/ImmutablePointerSet.h"
+#include "swift/Basic/SmallBitVector.h"
 #include "swift/SIL/BasicBlockData.h"
 #include "swift/SIL/BasicBlockDatastructures.h"
 #include "swift/SIL/DynamicCasts.h"