From 7e3943f5767d63b24c99aad056ad01cf7e6bfe52 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Sat, 4 Feb 2023 12:54:26 -0800 Subject: [PATCH] [clang-linker-wrapper] Fix build after MapVector change --- clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp index 6ec089a..8779042 100644 --- a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp +++ b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp @@ -185,7 +185,8 @@ Expected 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 Binary = OffloadBinary::write(Image); @@ -1058,11 +1059,8 @@ linkAndWrapDeviceFiles(SmallVectorImpl &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)); -- 2.7.4