From 466329d047fc53ea4a1ba3843c27a5cfdacd17a5 Mon Sep 17 00:00:00 2001 From: Shubham Sandeep Rastogi Date: Tue, 1 Feb 2022 10:30:28 -0800 Subject: 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 --- llvm/lib/Object/MachOObjectFile.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'llvm/lib/Object/MachOObjectFile.cpp') diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp index ba31862..3d95b18 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(SectionName) + .Case(MACHO, llvm::binaryformat::Swift5ReflectionSectionKind::KIND) + return StringSwitch( + SectionName) #include "llvm/BinaryFormat/Swift.def" - .Default(llvm::swift::Swift5ReflectionSectionKind::unknown); + .Default(llvm::binaryformat::Swift5ReflectionSectionKind::unknown); #undef HANDLE_SWIFT_SECTION } -- cgit v1.1