Change namespace llvm::swift to namespace llvm::binaryformat because of clashes with the apple/llvm-project repository

The namespace llvm::swift is causing errors to pop up in the apple/llvm-project build when cherry-picking 4ce1f3d into apple/llvm-project

Differential Review: https://reviews.llvm.org/D118716

Author: rastogishubham

llvm/include/llvm/BinaryFormat/Swift.h

@@ -9,7 +9,7 @@
 #define LLVM_BINARYFORMAT_SWIFT_H
 
 namespace llvm {
-namespace swift {
+namespace binaryformat {
 
 enum Swift5ReflectionSectionKind {
 #define HANDLE_SWIFT_SECTION(KIND, MACHO, ELF, COFF) KIND,
@@ -18,7 +18,7 @@ enum Swift5ReflectionSectionKind {
   unknown,
   last = unknown
 };
-} // end of namespace swift
+} // end of namespace binaryformat
 } // end of namespace llvm
 
 #endif

llvm/include/llvm/DWARFLinker/DWARFStreamer.h

@@ -88,7 +88,7 @@ class DwarfStreamer : public DwarfEmitter {
 
   /// Emit the swift reflection section stored in \p Buffer.
   void emitSwiftReflectionSection(
-      llvm::swift::Swift5ReflectionSectionKind ReflSectionKind,
+      llvm::binaryformat::Swift5ReflectionSectionKind ReflSectionKind,
       StringRef Buffer, uint32_t Alignment, uint32_t Size);
 
   /// Emit debug_ranges for \p FuncRange by translating the

llvm/include/llvm/MC/MCObjectFileInfo.h

@@ -230,7 +230,7 @@ class MCObjectFileInfo {
   MCSection *ReadOnly16Section = nullptr;
 
   // Swift5 Reflection Data Sections
-  std::array<MCSection *, swift::Swift5ReflectionSectionKind::last>
+  std::array<MCSection *, binaryformat::Swift5ReflectionSectionKind::last>
       Swift5ReflectionSections = {};
 
 public:
@@ -430,8 +430,9 @@ class MCObjectFileInfo {
 
   // Swift5 Reflection Data Sections
   MCSection *getSwift5ReflectionSection(
-      llvm::swift::Swift5ReflectionSectionKind ReflSectionKind) {
-    return ReflSectionKind != llvm::swift::Swift5ReflectionSectionKind::unknown
+      llvm::binaryformat::Swift5ReflectionSectionKind ReflSectionKind) {
+    return ReflSectionKind !=
+                   llvm::binaryformat::Swift5ReflectionSectionKind::unknown
                ? Swift5ReflectionSections[ReflSectionKind]
                : nullptr;
   }

llvm/include/llvm/Object/MachO.h

@@ -584,7 +584,7 @@ class MachOObjectFile : public ObjectFile {
 
   StringRef mapDebugSectionName(StringRef Name) const override;
 
-  llvm::swift::Swift5ReflectionSectionKind
+  llvm::binaryformat::Swift5ReflectionSectionKind
   mapReflectionSectionNameToEnumValue(StringRef SectionName) const override;
 
   bool hasPageZeroSegment() const { return HasPageZeroSegment; }

llvm/include/llvm/Object/ObjectFile.h

@@ -291,9 +291,9 @@ class ObjectFile : public SymbolicFile {
   virtual void getRelocationTypeName(DataRefImpl Rel,
                                      SmallVectorImpl<char> &Result) const = 0;
 
-  virtual llvm::swift::Swift5ReflectionSectionKind
+  virtual llvm::binaryformat::Swift5ReflectionSectionKind
   mapReflectionSectionNameToEnumValue(StringRef SectionName) const {
-    return llvm::swift::Swift5ReflectionSectionKind::unknown;
+    return llvm::binaryformat::Swift5ReflectionSectionKind::unknown;
   };
 
   Expected<uint64_t> getSymbolValue(DataRefImpl Symb) const;

llvm/lib/DWARFLinker/DWARFStreamer.cpp

@@ -305,8 +305,8 @@ void DwarfStreamer::emitSwiftAST(StringRef Buffer) {
 }
 
 void DwarfStreamer::emitSwiftReflectionSection(
-    llvm::swift::Swift5ReflectionSectionKind ReflSectionKind, StringRef Buffer,
-    uint32_t Alignment, uint32_t Size) {
+    llvm::binaryformat::Swift5ReflectionSectionKind ReflSectionKind,
+    StringRef Buffer, uint32_t Alignment, uint32_t Size) {
   MCSection *ReflectionSection =
       MOFI->getSwift5ReflectionSection(ReflSectionKind);
   if (ReflectionSection == nullptr)

llvm/lib/MC/MCObjectFileInfo.cpp

@@ -304,9 +304,10 @@ void MCObjectFileInfo::initMachOMCObjectFileInfo(const Triple &T) {
   // these sections in the __DWARF segment instead.
   if (!Ctx->getSwift5ReflectionSegmentName().empty()) {
 #define HANDLE_SWIFT_SECTION(KIND, MACHO, ELF, COFF)                           \
-  Swift5ReflectionSections[llvm::swift::Swift5ReflectionSectionKind::KIND] =   \
-      Ctx->getMachOSection(Ctx->getSwift5ReflectionSegmentName().data(),       \
-                           MACHO, 0, SectionKind::getMetadata());
+  Swift5ReflectionSections                                                     \
+      [llvm::binaryformat::Swift5ReflectionSectionKind::KIND] =                \
+          Ctx->getMachOSection(Ctx->getSwift5ReflectionSegmentName().data(),   \
+                               MACHO, 0, SectionKind::getMetadata());
 #include "llvm/BinaryFormat/Swift.def"
   }
 

llvm/lib/Object/MachOObjectFile.cpp

@@ -4767,13 +4767,14 @@ MachOObjectFile::findDsymObjectMembers(StringRef Path) {
   return ObjectPaths;
 }
 
-llvm::swift::Swift5ReflectionSectionKind
+llvm::binaryformat::Swift5ReflectionSectionKind
 MachOObjectFile::mapReflectionSectionNameToEnumValue(
     StringRef SectionName) const {
 #define HANDLE_SWIFT_SECTION(KIND, MACHO, ELF, COFF)                           \
-  .Case(MACHO, llvm::swift::Swift5ReflectionSectionKind::KIND)
-  return StringSwitch<llvm::swift::Swift5ReflectionSectionKind>(SectionName)
+  .Case(MACHO, llvm::binaryformat::Swift5ReflectionSectionKind::KIND)
+  return StringSwitch<llvm::binaryformat::Swift5ReflectionSectionKind>(
+             SectionName)
 #include "llvm/BinaryFormat/Swift.def"
-      .Default(llvm::swift::Swift5ReflectionSectionKind::unknown);
+      .Default(llvm::binaryformat::Swift5ReflectionSectionKind::unknown);
 #undef HANDLE_SWIFT_SECTION
 }

llvm/tools/dsymutil/DwarfLinkerForBinary.cpp

@@ -331,7 +331,7 @@ static bool binaryHasSwiftReflectionSections(const DebugMap &Map,
       }
       NameOrErr->consume_back("__TEXT");
       if (Object->mapReflectionSectionNameToEnumValue(*NameOrErr) !=
-          llvm::swift::Swift5ReflectionSectionKind::unknown) {
+          llvm::binaryformat::Swift5ReflectionSectionKind::unknown) {
         return true;
       }
     }