[Dsymutil][NFC] Move NonRelocatableStringpool into common CodeGen folder.

[avl]

Summary

This is the first patch from the set of patches extracted from D70709.

That refactoring moves NonRelocatableStringpool into common CodeGen folder.
So that NonRelocatableStringpool could be used not only inside dsymutil.

Testing results:

check-all - passed.
golden/new comparison:

golden-dsymutil/dsymutil build-Debug/bin/clang

md5 -r build-Debug/bin/clang.dSYM/Contents/Resources/DWARF/clang

a31430a6a2fbbd81fbed88888c769213 build-Debug/bin/clang.dSYM/Contents/Resources/DWARF/clang

new-dsymutil/dsymutil build-Debug/bin/clang

md5 -r build-Debug/bin/clang.dSYM/Contents/Resources/DWARF/clang

a31430a6a2fbbd81fbed88888c769213 build-Debug/bin/clang.dSYM/Contents/Resources/DWARF/clang

[JDevlieghere]

LGTM!

[gchatelet]

This patch seems to break my build:

[289/332] Linking CXX executable bin/dsymutil
FAILED: bin/dsymutil 
: && /redacted/build-llvm/clang/bin/clang++  -fPIC -fvisibility-inlines-hidden -Werror -Werror=date-time -Werror=unguarded-availability-new -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -pedantic -Wno-long-long -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wstring-conversion -fdiagnostics-color -g  -fuse-ld=lld -Wl,--color-diagnostics -Wl,-allow-shlib-undefined tools/dsymutil/CMakeFiles/dsymutil.dir/dsymutil.cpp.o tools/dsymutil/CMakeFiles/dsymutil.dir/BinaryHolder.cpp.o tools/dsymutil/CMakeFiles/dsymutil.dir/CFBundle.cpp.o tools/dsymutil/CMakeFiles/dsymutil.dir/CompileUnit.cpp.o tools/dsymutil/CMakeFiles/dsymutil.dir/DebugMap.cpp.o tools/dsymutil/CMakeFiles/dsymutil.dir/DeclContext.cpp.o tools/dsymutil/CMakeFiles/dsymutil.dir/DwarfLinker.cpp.o tools/dsymutil/CMakeFiles/dsymutil.dir/DwarfStreamer.cpp.o tools/dsymutil/CMakeFiles/dsymutil.dir/MachODebugMapParser.cpp.o tools/dsymutil/CMakeFiles/dsymutil.dir/MachOUtils.cpp.o tools/dsymutil/CMakeFiles/dsymutil.dir/SymbolMap.cpp.o  -o bin/dsymutil  -Wl,-rpath,"\$ORIGIN/../lib" lib/libLLVMAArch64CodeGen.so.10git lib/libLLVMAMDGPUCodeGen.so.10git lib/libLLVMARMCodeGen.so.10git lib/libLLVMBPFCodeGen.so.10git lib/libLLVMHexagonCodeGen.so.10git lib/libLLVMLanaiCodeGen.so.10git lib/libLLVMMipsCodeGen.so.10git lib/libLLVMMSP430CodeGen.so.10git lib/libLLVMNVPTXCodeGen.so.10git lib/libLLVMPowerPCCodeGen.so.10git lib/libLLVMRISCVCodeGen.so.10git lib/libLLVMSparcCodeGen.so.10git lib/libLLVMSystemZCodeGen.so.10git lib/libLLVMWebAssemblyCodeGen.so.10git lib/libLLVMX86CodeGen.so.10git lib/libLLVMXCoreCodeGen.so.10git lib/libLLVMARCCodeGen.so.10git lib/libLLVMAVRCodeGen.so.10git lib/libLLVMAArch64Desc.so.10git lib/libLLVMAMDGPUDesc.so.10git lib/libLLVMARMDesc.so.10git lib/libLLVMBPFDesc.so.10git lib/libLLVMHexagonDesc.so.10git lib/libLLVMLanaiDesc.so.10git lib/libLLVMMipsDesc.so.10git lib/libLLVMMSP430Desc.so.10git lib/libLLVMNVPTXDesc.so.10git lib/libLLVMPowerPCDesc.so.10git lib/libLLVMRISCVDesc.so.10git lib/libLLVMSparcDesc.so.10git lib/libLLVMSystemZDesc.so.10git lib/libLLVMWebAssemblyDesc.so.10git lib/libLLVMX86Desc.so.10git lib/libLLVMXCoreDesc.so.10git lib/libLLVMARCDesc.so.10git lib/libLLVMAVRDesc.so.10git lib/libLLVMAArch64Info.so.10git lib/libLLVMAMDGPUInfo.so.10git lib/libLLVMARMInfo.so.10git lib/libLLVMBPFInfo.so.10git lib/libLLVMHexagonInfo.so.10git lib/libLLVMLanaiInfo.so.10git lib/libLLVMMipsInfo.so.10git lib/libLLVMMSP430Info.so.10git lib/libLLVMNVPTXInfo.so.10git lib/libLLVMPowerPCInfo.so.10git lib/libLLVMRISCVInfo.so.10git lib/libLLVMSparcInfo.so.10git lib/libLLVMSystemZInfo.so.10git lib/libLLVMWebAssemblyInfo.so.10git lib/libLLVMX86Info.so.10git lib/libLLVMXCoreInfo.so.10git lib/libLLVMARCInfo.so.10git lib/libLLVMAVRInfo.so.10git lib/libLLVMAsmPrinter.so.10git lib/libLLVMDebugInfoDWARF.so.10git lib/libLLVMMC.so.10git lib/libLLVMObject.so.10git lib/libLLVMOption.so.10git lib/libLLVMRemarks.so.10git lib/libLLVMSupport.so.10git lib/libLLVMTarget.so.10git -lpthread && :
ld.lld: error: undefined symbol: llvm::NonRelocatableStringpool::internString(llvm::StringRef)
>>> referenced by DeclContext.cpp:91 (/redacted/git/llvm-project/llvm/tools/dsymutil/DeclContext.cpp:91)
>>>               tools/dsymutil/CMakeFiles/dsymutil.dir/DeclContext.cpp.o:(llvm::dsymutil::DeclContextTree::getChildDeclContext(llvm::dsymutil::DeclContext&, llvm::DWARFDie const&, llvm::dsymutil::CompileUnit&, llvm::StrongType<llvm::NonRelocatableStringpool, llvm::UniqueTag>&, bool))
>>> referenced by DeclContext.cpp:95 (/redacted/git/llvm-project/llvm/tools/dsymutil/DeclContext.cpp:95)
>>>               tools/dsymutil/CMakeFiles/dsymutil.dir/DeclContext.cpp.o:(llvm::dsymutil::DeclContextTree::getChildDeclContext(llvm::dsymutil::DeclContext&, llvm::DWARFDie const&, llvm::dsymutil::CompileUnit&, llvm::StrongType<llvm::NonRelocatableStringpool, llvm::UniqueTag>&, bool))
>>> referenced by DeclContext.cpp:98 (/redacted/git/llvm-project/llvm/tools/dsymutil/DeclContext.cpp:98)
>>>               tools/dsymutil/CMakeFiles/dsymutil.dir/DeclContext.cpp.o:(llvm::dsymutil::DeclContextTree::getChildDeclContext(llvm::dsymutil::DeclContext&, llvm::DWARFDie const&, llvm::dsymutil::CompileUnit&, llvm::StrongType<llvm::NonRelocatableStringpool, llvm::UniqueTag>&, bool))
>>> referenced by DeclContext.h:49 (/redacted/git/llvm-project/llvm/tools/dsymutil/DeclContext.h:49)
>>>               tools/dsymutil/CMakeFiles/dsymutil.dir/DeclContext.cpp.o:(llvm::dsymutil::CachedPathResolver::resolve(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, llvm::NonRelocatableStringpool&))
>>> referenced by DwarfLinker.cpp:2558 (/redacted/git/llvm-project/llvm/tools/dsymutil/DwarfLinker.cpp:2558)
>>>               tools/dsymutil/CMakeFiles/dsymutil.dir/DwarfLinker.cpp.o:(llvm::dsymutil::DwarfLinker::emitPaperTrailWarnings(llvm::dsymutil::DebugMapObject const&, llvm::dsymutil::DebugMap const&, llvm::StrongType<llvm::NonRelocatableStringpool, llvm::OffsetsTag>&))
>>> referenced by DwarfLinker.cpp:2559 (/redacted/git/llvm-project/llvm/tools/dsymutil/DwarfLinker.cpp:2559)
>>>               tools/dsymutil/CMakeFiles/dsymutil.dir/DwarfLinker.cpp.o:(llvm::dsymutil::DwarfLinker::emitPaperTrailWarnings(llvm::dsymutil::DebugMapObject const&, llvm::dsymutil::DebugMap const&, llvm::StrongType<llvm::NonRelocatableStringpool, llvm::OffsetsTag>&))

ld.lld: error: undefined symbol: llvm::NonRelocatableStringpool::getEntry(llvm::StringRef)
>>> referenced by DwarfLinker.cpp:205 (/redacted/git/llvm-project/llvm/tools/dsymutil/DwarfLinker.cpp:205)
>>>               tools/dsymutil/CMakeFiles/dsymutil.dir/DwarfLinker.cpp.o:(llvm::dsymutil::DwarfLinker::DIECloner::getDIENames(llvm::DWARFDie const&, llvm::dsymutil::DwarfLinker::DIECloner::AttributesInfo&, llvm::StrongType<llvm::NonRelocatableStringpool, llvm::OffsetsTag>&, bool))
>>> referenced by DwarfLinker.cpp:209 (/redacted/git/llvm-project/llvm/tools/dsymutil/DwarfLinker.cpp:209)
>>>               tools/dsymutil/CMakeFiles/dsymutil.dir/DwarfLinker.cpp.o:(llvm::dsymutil::DwarfLinker::DIECloner::getDIENames(llvm::DWARFDie const&, llvm::dsymutil::DwarfLinker::DIECloner::AttributesInfo&, llvm::StrongType<llvm::NonRelocatableStringpool, llvm::OffsetsTag>&, bool))
>>> referenced by DwarfLinker.cpp:215 (/redacted/git/llvm-project/llvm/tools/dsymutil/DwarfLinker.cpp:215)
>>>               tools/dsymutil/CMakeFiles/dsymutil.dir/DwarfLinker.cpp.o:(llvm::dsymutil::DwarfLinker::DIECloner::getDIENames(llvm::DWARFDie const&, llvm::dsymutil::DwarfLinker::DIECloner::AttributesInfo&, llvm::StrongType<llvm::NonRelocatableStringpool, llvm::OffsetsTag>&, bool))
>>> referenced by DwarfLinker.cpp:1121 (/redacted/git/llvm-project/llvm/tools/dsymutil/DwarfLinker.cpp:1121)
>>>               tools/dsymutil/CMakeFiles/dsymutil.dir/DwarfLinker.cpp.o:(llvm::dsymutil::DwarfLinker::DIECloner::cloneStringAttribute(llvm::DIE&, llvm::DWARFAbbreviationDeclaration::AttributeSpec, llvm::DWARFFormValue const&, llvm::DWARFUnit const&, llvm::StrongType<llvm::NonRelocatableStringpool, llvm::OffsetsTag>&, llvm::dsymutil::DwarfLinker::DIECloner::AttributesInfo&))
>>> referenced by DwarfLinker.cpp:1555 (/redacted/git/llvm-project/llvm/tools/dsymutil/DwarfLinker.cpp:1555)
>>>               tools/dsymutil/CMakeFiles/dsymutil.dir/DwarfLinker.cpp.o:(llvm::dsymutil::DwarfLinker::DIECloner::addObjCAccelerator(llvm::dsymutil::CompileUnit&, llvm::DIE const*, llvm::DwarfStringPoolEntryRef, llvm::StrongType<llvm::NonRelocatableStringpool, llvm::OffsetsTag>&, bool))
>>> referenced by DwarfLinker.cpp:1560 (/redacted/git/llvm-project/llvm/tools/dsymutil/DwarfLinker.cpp:1560)
>>>               tools/dsymutil/CMakeFiles/dsymutil.dir/DwarfLinker.cpp.o:(llvm::dsymutil::DwarfLinker::DIECloner::addObjCAccelerator(llvm::dsymutil::CompileUnit&, llvm::DIE const*, llvm::DwarfStringPoolEntryRef, llvm::StrongType<llvm::NonRelocatableStringpool, llvm::OffsetsTag>&, bool))
>>> referenced by DwarfLinker.cpp:1566 (/redacted/git/llvm-project/llvm/tools/dsymutil/DwarfLinker.cpp:1566)
>>>               tools/dsymutil/CMakeFiles/dsymutil.dir/DwarfLinker.cpp.o:(llvm::dsymutil::DwarfLinker::DIECloner::addObjCAccelerator(llvm::dsymutil::CompileUnit&, llvm::DIE const*, llvm::DwarfStringPoolEntryRef, llvm::StrongType<llvm::NonRelocatableStringpool, llvm::OffsetsTag>&, bool))
>>> referenced by DwarfLinker.cpp:1573 (/redacted/git/llvm-project/llvm/tools/dsymutil/DwarfLinker.cpp:1573)
>>>               tools/dsymutil/CMakeFiles/dsymutil.dir/DwarfLinker.cpp.o:(llvm::dsymutil::DwarfLinker::DIECloner::addObjCAccelerator(llvm::dsymutil::CompileUnit&, llvm::DIE const*, llvm::DwarfStringPoolEntryRef, llvm::StrongType<llvm::NonRelocatableStringpool, llvm::OffsetsTag>&, bool))
>>> referenced by DwarfLinker.cpp:1740 (/redacted/git/llvm-project/llvm/tools/dsymutil/DwarfLinker.cpp:1740)
>>>               tools/dsymutil/CMakeFiles/dsymutil.dir/DwarfLinker.cpp.o:(llvm::dsymutil::DwarfLinker::DIECloner::cloneDIE(llvm::DWARFDie const&, llvm::dsymutil::DebugMapObject const&, llvm::dsymutil::CompileUnit&, llvm::StrongType<llvm::NonRelocatableStringpool, llvm::OffsetsTag>&, long, unsigned int, unsigned int, bool, llvm::DIE*))
>>> referenced by NonRelocatableStringpool.h:42 (/redacted/git/llvm-project/llvm/include/llvm/CodeGen/NonRelocatableStringpool.h:42)
>>>               tools/dsymutil/CMakeFiles/dsymutil.dir/DwarfLinker.cpp.o:(llvm::NonRelocatableStringpool::getStringOffset(llvm::StringRef))
>>> referenced 1 more times

ld.lld: error: undefined symbol: llvm::NonRelocatableStringpool::getEntriesForEmission() const
>>> referenced by DwarfStreamer.cpp:196 (/redacted/git/llvm-project/llvm/tools/dsymutil/DwarfStreamer.cpp:196)
>>>               tools/dsymutil/CMakeFiles/dsymutil.dir/DwarfStreamer.cpp.o:(llvm::dsymutil::DwarfStreamer::emitStrings(llvm::NonRelocatableStringpool const&))
>>> referenced by MachOUtils.cpp:542 (/redacted/git/llvm-project/llvm/tools/dsymutil/MachOUtils.cpp:542)
>>>               tools/dsymutil/CMakeFiles/dsymutil.dir/MachOUtils.cpp.o:(llvm::dsymutil::MachOUtils::generateDsymCompanion(llvm::dsymutil::DebugMap const&, llvm::dsymutil::SymbolMapTranslator&, llvm::MCStreamer&, llvm::raw_fd_ostream&))
clang: error: linker command failed with exit code 1 (use -v to see invocation)
[297/332] Building CXX object lib/LTO/CMakeFiles/LLVMLTO.dir/ThinLTOCodeGenerator.cpp.o

[avl]

@gchatelet This patch seems to break my build:

I would check it. NonRelocatableStringpool was moved into llvm/CodeGen. It looks like lib/libLLVMCodeGen.so.10git library is not used. Could you tell me what options were used to build llvm, please ?

BUILD_SHARED_LIBS=ON
LLVM_ENABLE_LTO=ON

?

[gchatelet]

In D71068#1772464, @avl wrote:

@gchatelet This patch seems to break my build:

I would check it. NonRelocatableStringpool was moved into llvm/CodeGen. It looks like lib/libLLVMCodeGen.so.10git library is not used. Could you tell me what options were used to build llvm, please ?

-DCMAKE_C_COMPILER=/redacted/build-llvm/clang/bin/clang
-DCMAKE_CXX_COMPILER=/redacted/build-llvm/clang/bin/clang++
-DCMAKE_BUILD_TYPE=Debug
-LLVM_ENABLE_ASSERTIONS=ON
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-DLLVM_USE_SPLIT_DWARF=ON
-DLLVM_OPTIMIZED_TABLEGEN=ON
-DLLVM_TARGETS_TO_BUILD=all
-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=ARC;AVR
-DLLVM_ENABLE_PROJECTS=clang
-DBUILD_SHARED_LIBS=ON
-DLLVM_BUILD_TESTS=ON
-DLLVM_ENABLE_WERROR=ON
-DLLVM_ENABLE_LLD=ON

I should have posted them in the first place. My apologies.

[avl]

I integrated the fix which cures building of shared libraries - https://reviews.llvm.org/rG8c714c93023d7d039a23fb47c8256570ba54b9c7 . I would additionally check whether it is working now for all above settings. Thank you.

[gchatelet]

In D71068#1772572, @avl wrote:

I integrated the fix which cures building of shared libraries - https://reviews.llvm.org/rG8c714c93023d7d039a23fb47c8256570ba54b9c7 . I would additionally check whether it is working now for all above settings. Thank you.

It works ! Thank you.

llvm/include/llvm/CodeGen/NonRelocatableStringpool.h

-//===- NonRelocatableStringpool.h - A simple stringpool  --------*- C++ -*-===//
+//===- llvm/CodeGen/NonRelocatableStringpool.h - A simple stringpool  -----===//
 //
 // 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_TOOLS_DSYMUTIL_NONRELOCATABLESTRINGPOOL_H
-#define LLVM_TOOLS_DSYMUTIL_NONRELOCATABLESTRINGPOOL_H
+#ifndef LLVM_CODEGEN_NONRELOCATABLESTRINGPOOL_H
+#define LLVM_CODEGEN_NONRELOCATABLESTRINGPOOL_H
 
-#include "SymbolMap.h"
-
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/StringRef.h"
 #include "llvm/CodeGen/DwarfStringPoolEntry.h"
 #include "llvm/Support/Allocator.h"
 #include <cstdint>
 #include <vector>
 
 namespace llvm {
-namespace dsymutil {
 
 /// A string table that doesn't need relocations.
 ///
-/// We are doing a final link, no need for a string table that has relocation
-/// entries for every reference to it. This class provides this ability by just
-/// associating offsets with strings.
+/// Use this class when a string table doesn't need relocations.
+/// This class provides this ability by just associating offsets with strings.
 class NonRelocatableStringpool {
 public:
   /// Entries are stored into the StringMap and simply linked together through
   /// the second element of this pair in order to keep track of insertion
   /// order.
   using MapTy = StringMap<DwarfStringPoolEntry, BumpPtrAllocator>;
 
   NonRelocatableStringpool(
-      SymbolMapTranslator Translator = SymbolMapTranslator())
+      std::function<StringRef(StringRef Input)> Translator = nullptr,
+      bool PutEmptyString = false)
       : Translator(Translator) {
-    // Legacy dsymutil puts an empty string at the start of the line table.
+    if (PutEmptyString)
       EmptyString = getEntry("");
   }
 
   DwarfStringPoolEntryRef getEntry(StringRef S);
 
   /// Get the offset of string \p S in the string table. This can insert a new
   /// element or return the offset of a pre-existing one.
   uint32_t getStringOffset(StringRef S) { return getEntry(S).getOffset(); }
 
public:
   /// strings which were added via internString only.
   std::vector<DwarfStringPoolEntryRef> getEntriesForEmission() const;
 
 private:
   MapTy Strings;
   uint32_t CurrentEndOffset = 0;
   unsigned NumEntries = 0;
   DwarfStringPoolEntryRef EmptyString;
-  SymbolMapTranslator Translator;
+  std::function<StringRef(StringRef Input)> Translator;
 };
 
 /// Helper for making strong types.
 template <typename T, typename S> class StrongType : public T {
 public:
   template <typename... Args>
   explicit StrongType(Args... A) : T(std::forward<Args>(A)...) {}
 };
 
-/// It's very easy to introduce bugs by passing the wrong string pool in the
-/// dwarf linker. By using strong types the interface enforces that the right
+/// It's very easy to introduce bugs by passing the wrong string pool.
+/// By using strong types the interface enforces that the right
 /// kind of pool is used.
 struct UniqueTag {};
 struct OffsetsTag {};
 using UniquingStringPool = StrongType<NonRelocatableStringpool, UniqueTag>;
 using OffsetsStringPool = StrongType<NonRelocatableStringpool, OffsetsTag>;
 
-} // end namespace dsymutil
 } // end namespace llvm
 
-#endif // LLVM_TOOLS_DSYMUTIL_NONRELOCATABLESTRINGPOOL_H
+#endif // LLVM_CODEGEN_NONRELOCATABLESTRINGPOOL_H

llvm/lib/CodeGen/CMakeLists.txt

add_llvm_component_library(LLVMCodeGen
   MachineSSAUpdater.cpp
   MachineTraceMetrics.cpp
   MachineVerifier.cpp
   ModuloSchedule.cpp
   PatchableFunction.cpp
   MIRPrinter.cpp
   MIRPrintingPass.cpp
   MacroFusion.cpp
+  NonRelocatableStringpool.cpp
   OptimizePHIs.cpp
   ParallelCG.cpp
   PeepholeOptimizer.cpp
   PHIElimination.cpp
   PHIEliminationUtils.cpp
   PostRAHazardRecognizer.cpp
   PostRASchedulerList.cpp
   PreISelIntrinsicLowering.cpp

llvm/lib/CodeGen/NonRelocatableStringpool.cpp

-//===- NonRelocatableStringpool.cpp - A simple stringpool  ----------------===//
+//===-- llvm/CodeGen/NonRelocatableStringpool.cpp - A simple stringpool  --===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
-#include "NonRelocatableStringpool.h"
+#include "llvm/CodeGen/NonRelocatableStringpool.h"
 
 namespace llvm {
-namespace dsymutil {
 
 DwarfStringPoolEntryRef NonRelocatableStringpool::getEntry(StringRef S) {
   if (S.empty() && !Strings.empty())
     return EmptyString;
 
   if (Translator)
     S = Translator(S);
   auto I = Strings.insert({S, DwarfStringPoolEntry()});
if (E.getValue().isIndexed())
       Result.emplace_back(E, true);
   llvm::sort(Result, [](const DwarfStringPoolEntryRef A,
                         const DwarfStringPoolEntryRef B) {
     return A.getIndex() < B.getIndex();
   });
   return Result;
 }
 
-} // namespace dsymutil
 } // namespace llvm

llvm/tools/dsymutil/CMakeLists.txt

add_llvm_tool(dsymutil
   CFBundle.cpp
   CompileUnit.cpp
   DebugMap.cpp
   DeclContext.cpp
   DwarfLinker.cpp
   DwarfStreamer.cpp
   MachODebugMapParser.cpp
   MachOUtils.cpp
-  NonRelocatableStringpool.cpp
   SymbolMap.cpp
 
   DEPENDS
   intrinsics_gen
   ${tablegen_deps}
   )
 
 if(APPLE)
   target_link_libraries(dsymutil PRIVATE "-framework CoreFoundation")
 endif(APPLE)

llvm/tools/dsymutil/DeclContext.h

 //===- tools/dsymutil/DeclContext.h - Dwarf debug info linker ---*- 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_TOOLS_DSYMUTIL_DECLCONTEXT_H
 #define LLVM_TOOLS_DSYMUTIL_DECLCONTEXT_H
 
 #include "CompileUnit.h"
-#include "NonRelocatableStringpool.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/DenseMapInfo.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/CodeGen/NonRelocatableStringpool.h"
 #include "llvm/DebugInfo/DWARF/DWARFDie.h"
 #include "llvm/Support/Path.h"
 
 namespace llvm {
 namespace dsymutil {
 
 struct DeclMapInfo;
 

llvm/tools/dsymutil/DwarfLinker.cpp

 //===- tools/dsymutil/DwarfLinker.cpp - Dwarf debug info linker -----------===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
 #include "DwarfLinker.h"
 #include "BinaryHolder.h"
 #include "DebugMap.h"
 #include "DeclContext.h"
 #include "DwarfStreamer.h"
 #include "MachOUtils.h"
-#include "NonRelocatableStringpool.h"
 #include "dsymutil.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/BitVector.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/DenseMapInfo.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/Hashing.h"
 #include "llvm/ADT/IntervalMap.h"
 #include "llvm/ADT/None.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/PointerIntPair.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/BinaryFormat/Dwarf.h"
 #include "llvm/BinaryFormat/MachO.h"
 #include "llvm/CodeGen/AccelTable.h"
 #include "llvm/CodeGen/AsmPrinter.h"
 #include "llvm/CodeGen/DIE.h"
+#include "llvm/CodeGen/NonRelocatableStringpool.h"
 #include "llvm/Config/config.h"
 #include "llvm/DebugInfo/DIContext.h"
 #include "llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h"
 #include "llvm/DebugInfo/DWARF/DWARFContext.h"
 #include "llvm/DebugInfo/DWARF/DWARFDataExtractor.h"
 #include "llvm/DebugInfo/DWARF/DWARFDebugLine.h"
 #include "llvm/DebugInfo/DWARF/DWARFDebugRangeList.h"
 #include "llvm/DebugInfo/DWARF/DWARFDie.h"
for (const auto &Obj : Map.objects()) {
     ObjectContexts.emplace_back(Map, *this, *Obj.get());
     LinkContext &LC = ObjectContexts.back();
     if (LC.ObjectFile)
       updateAccelKind(*LC.DwarfContext);
   }
 
   // This Dwarf string pool which is only used for uniquing. This one should
   // never be used for offsets as its not thread-safe or predictable.
-  UniquingStringPool UniquingStringPool;
+  UniquingStringPool UniquingStringPool(nullptr, true);
 
   // This Dwarf string pool which is used for emission. It must be used
   // serially as the order of calling getStringOffset matters for
   // reproducibility.
-  OffsetsStringPool OffsetsStringPool(Options.Translator);
+  OffsetsStringPool OffsetsStringPool(Options.Translator, true);
 
   // ODR Contexts for the link.
   DeclContextTree ODRContexts;
 
   // If we haven't decided on an accelerator table kind yet, we base ourselves
   // on the DWARF we have seen so far. At this point we haven't pulled in debug
   // information from modules yet, so it is technically possible that they
   // would affect the decision. However, as they're built with the same

llvm/tools/dsymutil/DwarfStreamer.h

 //===- tools/dsymutil/DwarfStreamer.h - Dwarf Streamer ----------*- 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_TOOLS_DSYMUTIL_DWARFSTREAMER_H
 #define LLVM_TOOLS_DSYMUTIL_DWARFSTREAMER_H
 
 #include "CompileUnit.h"
 #include "DebugMap.h"
 #include "LinkUtils.h"
-#include "NonRelocatableStringpool.h"
 #include "llvm/CodeGen/AccelTable.h"
 #include "llvm/CodeGen/AsmPrinter.h"
+#include "llvm/CodeGen/NonRelocatableStringpool.h"
 #include "llvm/DebugInfo/DWARF/DWARFDebugLine.h"
 #include "llvm/DebugInfo/DWARF/DWARFDebugRangeList.h"
 #include "llvm/MC/MCAsmBackend.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCCodeEmitter.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCDwarf.h"
 #include "llvm/MC/MCInstrInfo.h"

llvm/tools/dsymutil/MachOUtils.cpp

 //===-- MachOUtils.cpp - Mach-o specific helpers for dsymutil  ------------===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
 #include "MachOUtils.h"
 #include "BinaryHolder.h"
 #include "DebugMap.h"
 #include "LinkUtils.h"
-#include "NonRelocatableStringpool.h"
+#include "llvm/CodeGen/NonRelocatableStringpool.h"
 #include "llvm/MC/MCAsmLayout.h"
 #include "llvm/MC/MCMachObjectWriter.h"
 #include "llvm/MC/MCObjectStreamer.h"
 #include "llvm/MC/MCSectionMachO.h"
 #include "llvm/MC/MCStreamer.h"
 #include "llvm/Object/MachO.h"
 #include "llvm/Support/FileUtilities.h"
 #include "llvm/Support/Program.h"
bool generateDsymCompanion(const DebugMap &DM, SymbolMapTranslator &Translator,
   }
 
   if (NumDwarfSections) {
     ++NumLoadCommands;
     LoadCommandSize += segmentLoadCommandSize(Is64Bit, NumDwarfSections);
   }
 
   SmallString<0> NewSymtab;
-  NonRelocatableStringpool NewStrings(Translator);
+  std::function<StringRef(StringRef)> TranslationLambda =
+      Translator ? [&](StringRef Input) { return Translator(Input); }
+                 : static_cast<std::function<StringRef(StringRef)>>(nullptr);
+  // Legacy dsymutil puts an empty string at the start of the line table.
+  // thus we set NonRelocatableStringpool(,PutEmptyString=true)
+  NonRelocatableStringpool NewStrings(TranslationLambda, true);
   unsigned NListSize = Is64Bit ? sizeof(MachO::nlist_64) : sizeof(MachO::nlist);
   unsigned NumSyms = 0;
   uint64_t NewStringsSize = 0;
   if (ShouldEmitSymtab) {
     NewSymtab.reserve(SymtabCmd.nsyms * NListSize / 2);
     NumSyms = transferSymbols(InputBinary, NewSymtab, NewStrings);
     NewStringsSize = NewStrings.getSize() + 1;
   }