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

[rastogishubham]

Summary

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

/home/buildnode/jenkins/workspace/apple-llvm-project-pr-linux/swift/include/swift/Basic/FlaggedPointer.h:158:28: error: no template named 'FlaggedPointer' in namespace 'llvm::swift'; did you mean '::swift::FlaggedPointer'?
11:55:06 getAsVoidPointer(const swift::FlaggedPointer<PointerTy, BitPosition> &P) {
11:55:06 ^~~~~~~~~~~~~~~~~~~~~
11:55:06 ::swift::FlaggedPointer
11:55:06 /home/buildnode/jenkins/workspace/apple-llvm-project-pr-linux/swift/include/swift/Basic/FlaggedPointer.h:38:7: note: '::swift::FlaggedPointer' declared here
11:55:06 class FlaggedPointer {
11:55:06 ^

[aprantl]

llvm/include/llvm/BinaryFormat/Swift.h

12

Since the enum starts with Swift, calling the namespace swift... is redundant.
How about just calling the namespace "binaryformat"?

[aprantl]

lgtm with comments addressed

[rastogishubham]

llvm/include/llvm/BinaryFormat/Swift.h

12

Sure let me change that

[rastogishubham]

Changed name to binaryformat from swiftbinaryformat

[rastogishubham]

466329d047fc53ea4a1ba3843c27a5cfdacd17a5

llvm/include/llvm/BinaryFormat/Swift.h

 //===-- llvm/BinaryFormat/Swift.h ---Swift Constants-------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 
 #ifndef LLVM_BINARYFORMAT_SWIFT_H
 #define LLVM_BINARYFORMAT_SWIFT_H
 
 namespace llvm {
-namespace swift {
+namespace binaryformat {
 
 enum Swift5ReflectionSectionKind {
 #define HANDLE_SWIFT_SECTION(KIND, MACHO, ELF, COFF) KIND,
 #include "llvm/BinaryFormat/Swift.def"
 #undef HANDLE_SWIFT_SECTION
   unknown,
   last = unknown
 };
-} // end of namespace swift
+} // end of namespace binaryformat
 } // end of namespace llvm
 
 #endif

llvm/include/llvm/DWARFLinker/DWARFStreamer.h

public:
   /// Emit the string table described by \p Pool.
   void emitStrings(const NonRelocatableStringpool &Pool) override;
 
   /// Emit the swift_ast section stored in \p Buffer.
   void emitSwiftAST(StringRef Buffer);
 
   /// 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
   /// original \p Entries.
   void emitRangesEntries(
       int64_t UnitPcOffset, uint64_t OrigLowPc,
       const FunctionIntervals::const_iterator &FuncRange,
       const std::vector<DWARFDebugRangeList::RangeListEntry> &Entries,

llvm/include/llvm/MC/MCObjectFileInfo.h

protected:
   MCSection *GLJMPSection = nullptr;
 
   // XCOFF specific sections
   MCSection *TOCBaseSection = nullptr;
   MCSection *ReadOnly8Section = nullptr;
   MCSection *ReadOnly16Section = nullptr;
 
   // Swift5 Reflection Data Sections
-  std::array<MCSection *, swift::Swift5ReflectionSectionKind::last>
+  std::array<MCSection *, binaryformat::Swift5ReflectionSectionKind::last>
       Swift5ReflectionSections = {};
 
 public:
   void initMCObjectFileInfo(MCContext &MCCtx, bool PIC,
                             bool LargeCodeModel = false);
   virtual ~MCObjectFileInfo();
   MCContext &getContext() const { return *Ctx; }
 
public:
   MCSection *getTOCBaseSection() const { return TOCBaseSection; }
 
   MCSection *getEHFrameSection() const { return EHFrameSection; }
 
   bool isPositionIndependent() const { return PositionIndependent; }
 
   // 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;
   }
 
 private:
   bool PositionIndependent = false;
   MCContext *Ctx = nullptr;
   VersionTuple SDKVersion;

llvm/include/llvm/Object/MachO.h

public:
   static bool isValidArch(StringRef ArchFlag);
   static ArrayRef<StringRef> getValidArchs();
   static Triple getHostArch();
 
   bool isRelocatableObject() const override;
 
   StringRef mapDebugSectionName(StringRef Name) const override;
 
-  llvm::swift::Swift5ReflectionSectionKind
+  llvm::binaryformat::Swift5ReflectionSectionKind
   mapReflectionSectionNameToEnumValue(StringRef SectionName) const override;
 
   bool hasPageZeroSegment() const { return HasPageZeroSegment; }
 
   static bool classof(const Binary *v) {
     return v->isMachO();
   }
 

llvm/include/llvm/Object/ObjectFile.h

protected:
   friend class RelocationRef;
   virtual void moveRelocationNext(DataRefImpl &Rel) const = 0;
   virtual uint64_t getRelocationOffset(DataRefImpl Rel) const = 0;
   virtual symbol_iterator getRelocationSymbol(DataRefImpl Rel) const = 0;
   virtual uint64_t getRelocationType(DataRefImpl Rel) const = 0;
   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;
 
 public:
   ObjectFile() = delete;
   ObjectFile(const ObjectFile &other) = delete;
 

llvm/lib/DWARFLinker/DWARFStreamer.cpp

 void DwarfStreamer::emitSwiftAST(StringRef Buffer) {
   MCSection *SwiftASTSection = MOFI->getDwarfSwiftASTSection();
   SwiftASTSection->setAlignment(Align(32));
   MS->SwitchSection(SwiftASTSection);
   MS->emitBytes(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)
     return;
   ReflectionSection->setAlignment(Align(Alignment));
   MS->SwitchSection(ReflectionSection);
   MS->emitBytes(Buffer);
 }

llvm/lib/MC/MCObjectFileInfo.cpp

void MCObjectFileInfo::initMachOMCObjectFileInfo(const Triple &T) {
   RemarksSection = Ctx->getMachOSection(
       "__LLVM", "__remarks", MachO::S_ATTR_DEBUG, SectionKind::getMetadata());
 
   // The architecture of dsymutil makes it very difficult to copy the Swift
   // reflection metadata sections into the __TEXT segment, so dsymutil creates
   // 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(),       \
+  Swift5ReflectionSections                                                     \
+      [llvm::binaryformat::Swift5ReflectionSectionKind::KIND] =                \
+          Ctx->getMachOSection(Ctx->getSwift5ReflectionSegmentName().data(),   \
                                MACHO, 0, SectionKind::getMetadata());
 #include "llvm/BinaryFormat/Swift.def"
   }
 
   TLSExtraDataSection = TLSTLVSection;
 }
 
 void MCObjectFileInfo::initELFMCObjectFileInfo(const Triple &T, bool Large) {
   switch (T.getArch()) {

llvm/lib/Object/MachOObjectFile.cpp

     return createFileError(BundlePath, errorCodeToError(EC));
   if (ObjectPaths.empty())
     return createStringError(std::error_code(),
                              "%s: no objects found in dSYM bundle",
                              Path.str().c_str());
   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

for (auto &Section : Object->sections()) {
       llvm::Expected<llvm::StringRef> NameOrErr =
           Object->getSectionName(Section.getRawDataRefImpl());
       if (!NameOrErr) {
         llvm::consumeError(NameOrErr.takeError());
         continue;
       }
       NameOrErr->consume_back("__TEXT");
       if (Object->mapReflectionSectionNameToEnumValue(*NameOrErr) !=
-          llvm::swift::Swift5ReflectionSectionKind::unknown) {
+          llvm::binaryformat::Swift5ReflectionSectionKind::unknown) {
         return true;
       }
     }
   }
   return false;
 }
 
 static void