[llvm] 466329d - Change namespace llvm::swift to namespace llvm::binaryformat because of clashes with the apple/llvm-project repository
Shubham Sandeep Rastogi via llvm-commits
llvm-commits at lists.llvm.org
Tue Feb 1 11:16:15 PST 2022
Author: Shubham Sandeep Rastogi
Date: 2022-02-01T11:15:21-08:00
New Revision: 466329d047fc53ea4a1ba3843c27a5cfdacd17a5
URL: https://github.com/llvm/llvm-project/commit/466329d047fc53ea4a1ba3843c27a5cfdacd17a5
DIFF: https://github.com/llvm/llvm-project/commit/466329d047fc53ea4a1ba3843c27a5cfdacd17a5.diff
LOG: 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 4ce1f3d47c33 into apple/llvm-project
Differential Review: https://reviews.llvm.org/D118716
Added:
Modified:
llvm/include/llvm/BinaryFormat/Swift.h
llvm/include/llvm/DWARFLinker/DWARFStreamer.h
llvm/include/llvm/MC/MCObjectFileInfo.h
llvm/include/llvm/Object/MachO.h
llvm/include/llvm/Object/ObjectFile.h
llvm/lib/DWARFLinker/DWARFStreamer.cpp
llvm/lib/MC/MCObjectFileInfo.cpp
llvm/lib/Object/MachOObjectFile.cpp
llvm/tools/dsymutil/DwarfLinkerForBinary.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/BinaryFormat/Swift.h b/llvm/include/llvm/BinaryFormat/Swift.h
index 252b84169fc2..68c04f11196e 100644
--- a/llvm/include/llvm/BinaryFormat/Swift.h
+++ b/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
diff --git a/llvm/include/llvm/DWARFLinker/DWARFStreamer.h b/llvm/include/llvm/DWARFLinker/DWARFStreamer.h
index 8e845ee91b9f..fc8c59904cfb 100644
--- a/llvm/include/llvm/DWARFLinker/DWARFStreamer.h
+++ b/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
diff --git a/llvm/include/llvm/MC/MCObjectFileInfo.h b/llvm/include/llvm/MC/MCObjectFileInfo.h
index 211cb6f52bfe..3c1d10c4e62f 100644
--- a/llvm/include/llvm/MC/MCObjectFileInfo.h
+++ b/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;
}
diff --git a/llvm/include/llvm/Object/MachO.h b/llvm/include/llvm/Object/MachO.h
index 09b6454bb0c1..49a0706b84be 100644
--- a/llvm/include/llvm/Object/MachO.h
+++ b/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; }
diff --git a/llvm/include/llvm/Object/ObjectFile.h b/llvm/include/llvm/Object/ObjectFile.h
index 08ab08b05abd..950c38a599d5 100644
--- a/llvm/include/llvm/Object/ObjectFile.h
+++ b/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;
diff --git a/llvm/lib/DWARFLinker/DWARFStreamer.cpp b/llvm/lib/DWARFLinker/DWARFStreamer.cpp
index 7f9b9a9bc793..99e12fce6513 100644
--- a/llvm/lib/DWARFLinker/DWARFStreamer.cpp
+++ b/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)
diff --git a/llvm/lib/MC/MCObjectFileInfo.cpp b/llvm/lib/MC/MCObjectFileInfo.cpp
index 77b0b0ee687c..b7890e7f0937 100644
--- a/llvm/lib/MC/MCObjectFileInfo.cpp
+++ b/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"
}
diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp
index ba31862b19c9..3d95b18f4672 100644
--- a/llvm/lib/Object/MachOObjectFile.cpp
+++ b/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
}
diff --git a/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp b/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp
index fb31c5b09429..a7df034f1c55 100644
--- a/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp
+++ b/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;
}
}
More information about the llvm-commits
mailing list