[clang] eb8d036 - [clang-linker-wrapper] Use MapVector to stabilize iteration order

[Fangrui Song via cfe-commits]

Author: Fangrui Song
Date: 2024-06-19T11:46:52-07:00
New Revision: eb8d036565496d4466ad9974fdf8ff91812feefb

URL: https://github.com/llvm/llvm-project/commit/eb8d036565496d4466ad9974fdf8ff91812feefb
DIFF: https://github.com/llvm/llvm-project/commit/eb8d036565496d4466ad9974fdf8ff91812feefb.diff

LOG: [clang-linker-wrapper] Use MapVector to stabilize iteration order

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 0a780c478c303..623e888a3bf86 100644
--- a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
+++ b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
@@ -1152,7 +1152,7 @@ DerivedArgList getLinkerArgs(ArrayRef<OffloadFile> Input,
 
 Error handleOverrideImages(
     const InputArgList &Args,
-    DenseMap<OffloadKind, SmallVector<OffloadingImage>> &Images) {
+    MapVector<OffloadKind, SmallVector<OffloadingImage, 0>> &Images) {
   for (StringRef Arg : Args.getAllArgValues(OPT_override_image)) {
     OffloadKind Kind = getOffloadKind(Arg.split("=").first);
     StringRef Filename = Arg.split("=").second;
@@ -1191,7 +1191,7 @@ Expected<SmallVector<StringRef>> linkAndWrapDeviceFiles(
   llvm::TimeTraceScope TimeScope("Handle all device input");
 
   std::mutex ImageMtx;
-  DenseMap<OffloadKind, SmallVector<OffloadingImage>> Images;
+  MapVector<OffloadKind, SmallVector<OffloadingImage, 0>> Images;
 
   // Initialize the images with any overriding inputs.
   if (Args.hasArg(OPT_override_image))