diff options
-rw-r--r-- | llvm/tools/dsymutil/DwarfLinker.cpp | 4 | ||||
-rw-r--r-- | llvm/tools/dsymutil/DwarfLinker.h | 6 | ||||
-rw-r--r-- | llvm/tools/dsymutil/dsymutil.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/llvm/tools/dsymutil/DwarfLinker.cpp b/llvm/tools/dsymutil/DwarfLinker.cpp index 0eeeca27ac3..eb76b1ad600 100644 --- a/llvm/tools/dsymutil/DwarfLinker.cpp +++ b/llvm/tools/dsymutil/DwarfLinker.cpp @@ -2850,8 +2850,8 @@ bool DwarfLinker::link(const DebugMap &Map) { } // namespace dsymutil bool linkDwarf(raw_fd_ostream &OutFile, BinaryHolder &BinHolder, - const DebugMap &DM, const LinkOptions &Options) { - DwarfLinker Linker(OutFile, BinHolder, Options); + const DebugMap &DM, LinkOptions Options) { + DwarfLinker Linker(OutFile, BinHolder, std::move(Options)); return Linker.link(DM); } diff --git a/llvm/tools/dsymutil/DwarfLinker.h b/llvm/tools/dsymutil/DwarfLinker.h index 482c607d22c..f8b8729bf91 100644 --- a/llvm/tools/dsymutil/DwarfLinker.h +++ b/llvm/tools/dsymutil/DwarfLinker.h @@ -56,8 +56,8 @@ using UnitListTy = std::vector<std::unique_ptr<CompileUnit>>; class DwarfLinker { public: DwarfLinker(raw_fd_ostream &OutFile, BinaryHolder &BinHolder, - const LinkOptions &Options) - : OutFile(OutFile), BinHolder(BinHolder), Options(Options) {} + LinkOptions Options) + : OutFile(OutFile), BinHolder(BinHolder), Options(std::move(Options)) {} /// Link the contents of the DebugMap. bool link(const DebugMap &); @@ -499,7 +499,7 @@ private: /// be uniqued and sorted and there are only few entries expected /// per compile unit, which is why this is a std::map. std::map<std::string, std::string> ParseableSwiftInterfaces; - + bool ModuleCacheHintDisplayed = false; bool ArchiveHintDisplayed = false; }; diff --git a/llvm/tools/dsymutil/dsymutil.h b/llvm/tools/dsymutil/dsymutil.h index ac70bdaa82b..3c44b9564be 100644 --- a/llvm/tools/dsymutil/dsymutil.h +++ b/llvm/tools/dsymutil/dsymutil.h @@ -46,7 +46,7 @@ bool dumpStab(StringRef InputFile, ArrayRef<std::string> Archs, /// Link the Dwarf debug info as directed by the passed DebugMap \p DM into a /// DwarfFile named \p OutputFilename. \returns false if the link failed. bool linkDwarf(raw_fd_ostream &OutFile, BinaryHolder &BinHolder, - const DebugMap &DM, const LinkOptions &Options); + const DebugMap &DM, LinkOptions Options); } // end namespace dsymutil } // end namespace llvm |