[llvm] r265610 - Fix the compare-clang diff error introduced by r265547.

Wei Mi via llvm-commits llvm-commits at lists.llvm.org
Wed Apr 6 15:31:17 PDT 2016


Author: wmi
Date: Wed Apr  6 17:31:17 2016
New Revision: 265610

URL: http://llvm.org/viewvc/llvm-project?rev=265610&view=rev
Log:
Fix the compare-clang diff error introduced by r265547.

Use MapVector instead of DenseMap for MergeableSpillsMap so it will be
iterated in determined order.

Modified:
    llvm/trunk/lib/CodeGen/InlineSpiller.cpp

Modified: llvm/trunk/lib/CodeGen/InlineSpiller.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/InlineSpiller.cpp?rev=265610&r1=265609&r2=265610&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/InlineSpiller.cpp (original)
+++ llvm/trunk/lib/CodeGen/InlineSpiller.cpp Wed Apr  6 17:31:17 2016
@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "Spiller.h"
+#include "llvm/ADT/MapVector.h"
 #include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/TinyPtrVector.h"
@@ -71,7 +72,7 @@ class HoistSpillHelper {
   // Map from pair of (StackSlot and Original VNI) to a set of spills which
   // have the same stackslot and have equal values defined by Original VNI.
   // These spills are mergeable and are hoist candiates.
-  typedef DenseMap<std::pair<int, VNInfo *>, SmallPtrSet<MachineInstr *, 16>>
+  typedef MapVector<std::pair<int, VNInfo *>, SmallPtrSet<MachineInstr *, 16>>
       MergeableSpillsMap;
   MergeableSpillsMap MergeableSpills;
 




More information about the llvm-commits mailing list