Author: Fangrui Song Date: 2023-02-04T12:54:26-08:00 New Revision: 7e3943f5767d63b24c99aad056ad01cf7e6bfe52
URL: https://github.com/llvm/llvm-project/commit/7e3943f5767d63b24c99aad056ad01cf7e6bfe52 DIFF: https://github.com/llvm/llvm-project/commit/7e3943f5767d63b24c99aad056ad01cf7e6bfe52.diff LOG: [clang-linker-wrapper] Fix build after MapVector change Added: Modified: clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp Removed: ################################################################################ diff --git a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp index 6ec089a8233c0..8779042f81fde 100644 --- a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp +++ b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp @@ -185,7 +185,8 @@ Expected<OffloadFile> getInputBitcodeLibrary(StringRef Input) { OffloadingImage Image{}; Image.TheImageKind = IMG_Bitcode; Image.TheOffloadKind = getOffloadKind(Kind); - Image.StringData = {{"triple", Triple}, {"arch", Arch}}; + Image.StringData["triple"] = Triple; + Image.StringData["arch"] = Arch; Image.Image = std::move(*ImageOrError); std::unique_ptr<MemoryBuffer> Binary = OffloadBinary::write(Image); @@ -1058,11 +1059,8 @@ linkAndWrapDeviceFiles(SmallVectorImpl<OffloadFile> &LinkerInputFiles, TheImage.TheImageKind = Args.hasArg(OPT_embed_bitcode) ? IMG_Bitcode : IMG_Object; TheImage.TheOffloadKind = Kind; - TheImage.StringData = { - {"triple", - Args.MakeArgString(LinkerArgs.getLastArgValue(OPT_triple_EQ))}, - {"arch", - Args.MakeArgString(LinkerArgs.getLastArgValue(OPT_arch_EQ))}}; + TheImage.StringData["triple"] = Args.MakeArgString(LinkerArgs.getLastArgValue(OPT_triple_EQ)); + TheImage.StringData["arch"] = Args.MakeArgString(LinkerArgs.getLastArgValue(OPT_arch_EQ)); TheImage.Image = std::move(*FileOrErr); Images[Kind].emplace_back(std::move(TheImage)); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
