Revert the non-cleanup part of r230769 because it introduced a non-determinism found...

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@231058 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/TableGen/CodeGenRegisters.cpp b/utils/TableGen/CodeGenRegisters.cpp
index f89ba9ea5b2bab831b0a3940ff1d92326fa60d49..56ac6e0884e15ed08dc546ffd851cd80544a7e05 100644 (file)
--- a/utils/TableGen/CodeGenRegisters.cpp
+++ b/utils/TableGen/CodeGenRegisters.cpp
@@ -258,8 +258,6 @@ CodeGenRegister::computeSubRegs(CodeGenRegBank &RegBank) {
 
     // Look at the possible compositions of Idx.
     // They may not all be supported by SR.
-    // NOTE: Iteration order does not matter here because the EnumValue's
-    // of subreg indices are unique.
     for (CodeGenSubRegIndex::CompMap::const_iterator I = Comps.begin(),
            E = Comps.end(); I != E; ++I) {
       SubRegMap::const_iterator SRI = Map.find(I->first);

diff --git a/utils/TableGen/CodeGenRegisters.h b/utils/TableGen/CodeGenRegisters.h
index 0ebfbc564b3fa3de16f07ffc51d9326e2a0bc3fa..e6e85b7f0ebd2c9dae02d30823a0d2180f250bdd 100644 (file)
--- a/utils/TableGen/CodeGenRegisters.h
+++ b/utils/TableGen/CodeGenRegisters.h
@@ -75,7 +75,8 @@ namespace llvm {
     std::string getQualifiedName() const;
 
     // Map of composite subreg indices.
-    typedef DenseMap<CodeGenSubRegIndex *, CodeGenSubRegIndex *> CompMap;
+    typedef std::map<CodeGenSubRegIndex *, CodeGenSubRegIndex *,
+                     deref<llvm::less>> CompMap;
 
     // Returns the subreg index that results from composing this with Idx.
     // Returns NULL if this and Idx don't compose.