llvm
diff --git a/‎llvm/include/llvm/CodeGen/GCMetadata.h
Copy file name to clipboardExpand all lines: llvm/include/llvm/CodeGen/GCMetadata.h
+4-3 b/‎llvm/include/llvm/CodeGen/GCMetadata.h
Copy file name to clipboardExpand all lines: llvm/include/llvm/CodeGen/GCMetadata.h
+4-3
diff --git a/‎llvm/lib/CodeGen/GCMetadata.cpp
Copy file name to clipboardExpand all lines: llvm/lib/CodeGen/GCMetadata.cpp
+5-7 b/‎llvm/lib/CodeGen/GCMetadata.cpp
Copy file name to clipboardExpand all lines: llvm/lib/CodeGen/GCMetadata.cpp
+5-7
@@ -33,6 +33,7 @@
 #define LLVM_CODEGEN_GCMETADATA_H
 
 #include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/MapVector.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
@@ -151,9 +152,9 @@ class GCFunctionInfo {
   size_t live_size(const iterator &p) const { return roots_size(); }
 };
 
-struct GCStrategyMap {
-  StringMap<std::unique_ptr<GCStrategy>> StrategyMap;
-
+class GCStrategyMap : public MapVector<std::string, std::unique_ptr<GCStrategy>,
+                                       StringMap<unsigned>> {
+public:
   GCStrategyMap() = default;
   GCStrategyMap(GCStrategyMap &&) = default;
 
 
@@ -26,7 +26,7 @@ bool GCStrategyMap::invalidate(Module &M, const PreservedAnalyses &PA,
   for (const auto &F : M) {
     if (F.isDeclaration() || !F.hasGC())
       continue;
-    if (!StrategyMap.contains(F.getGC()))
+    if (!contains(F.getGC()))
       return true;
   }
   return false;
@@ -36,17 +36,16 @@ AnalysisKey CollectorMetadataAnalysis::Key;
 
 CollectorMetadataAnalysis::Result
 CollectorMetadataAnalysis::run(Module &M, ModuleAnalysisManager &MAM) {
-  Result R;
-  auto &Map = R.StrategyMap;
+  Result StrategyMap;
   for (auto &F : M) {
     if (F.isDeclaration() || !F.hasGC())
       continue;
     auto GCName = F.getGC();
-    auto [It, Inserted] = Map.try_emplace(GCName);
+    auto [It, Inserted] = StrategyMap.try_emplace(GCName);
     if (Inserted)
       It->second = getGCStrategy(GCName);
   }
-  return R;
+  return StrategyMap;
 }
 
 AnalysisKey GCFunctionAnalysis::Key;
@@ -61,8 +60,7 @@ GCFunctionAnalysis::run(Function &F, FunctionAnalysisManager &FAM) {
       MAMProxy.cachedResultExists<CollectorMetadataAnalysis>(*F.getParent()) &&
       "This pass need module analysis `collector-metadata`!");
   auto &Map =
-      MAMProxy.getCachedResult<CollectorMetadataAnalysis>(*F.getParent())
-          ->StrategyMap;
+      *MAMProxy.getCachedResult<CollectorMetadataAnalysis>(*F.getParent());
   GCFunctionInfo Info(F, *Map[F.getGC()]);
   return Info;
 }