[llvm-branch-commits] [llvm-branch] r80544 - in /llvm/branches/release_26/utils/TableGen: CodeGenDAGPatterns.cpp CodeGenDAGPatterns.h

[Tanya Lattner]

Author: tbrethou
Date: Mon Aug 31 01:14:19 2009
New Revision: 80544

URL: http://llvm.org/viewvc/llvm-project?rev=80544&view=rev
Log:
Merge from mainline
Try to fix MSVC build after r79846.

Modified:
    llvm/branches/release_26/utils/TableGen/CodeGenDAGPatterns.cpp
    llvm/branches/release_26/utils/TableGen/CodeGenDAGPatterns.h

Modified: llvm/branches/release_26/utils/TableGen/CodeGenDAGPatterns.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_26/utils/TableGen/CodeGenDAGPatterns.cpp?rev=80544&r1=80543&r2=80544&view=diff

==============================================================================
--- llvm/branches/release_26/utils/TableGen/CodeGenDAGPatterns.cpp (original)
+++ llvm/branches/release_26/utils/TableGen/CodeGenDAGPatterns.cpp Mon Aug 31 01:14:19 2009
@@ -1331,7 +1331,7 @@
 }
 
 CodeGenDAGPatterns::~CodeGenDAGPatterns() {
-  for (std::map<Record*, TreePattern*>::iterator I = PatternFragments.begin(),
+  for (pf_iterator I = PatternFragments.begin(),
        E = PatternFragments.end(); I != E; ++I)
     delete I->second;
 }
@@ -1983,7 +1983,8 @@
   }
    
   // If we can, convert the instructions to be patterns that are matched!
-  for (std::map<Record*, DAGInstruction>::iterator II = Instructions.begin(),
+  for (std::map<Record*, DAGInstruction, RecordPtrCmp>::iterator II =
+        Instructions.begin(),
        E = Instructions.end(); II != E; ++II) {
     DAGInstruction &TheInst = II->second;
     const TreePattern *I = TheInst.getPattern();

Modified: llvm/branches/release_26/utils/TableGen/CodeGenDAGPatterns.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_26/utils/TableGen/CodeGenDAGPatterns.h?rev=80544&r1=80543&r2=80544&view=diff

==============================================================================
--- llvm/branches/release_26/utils/TableGen/CodeGenDAGPatterns.h (original)
+++ llvm/branches/release_26/utils/TableGen/CodeGenDAGPatterns.h Mon Aug 31 01:14:19 2009
@@ -509,7 +509,8 @@
     return SDNodeXForms.find(R)->second;
   }
   
-  typedef std::map<Record*, NodeXForm>::const_iterator nx_iterator;
+  typedef std::map<Record*, NodeXForm, RecordPtrCmp>::const_iterator
+          nx_iterator;
   nx_iterator nx_begin() const { return SDNodeXForms.begin(); }
   nx_iterator nx_end() const { return SDNodeXForms.end(); }
 
@@ -556,7 +557,8 @@
     assert(PatternFragments.count(R) && "Invalid pattern fragment request!");
     return PatternFragments.find(R)->second;
   }
-  typedef std::map<Record*, TreePattern*>::const_iterator pf_iterator;
+  typedef std::map<Record*, TreePattern*, RecordPtrCmp>::const_iterator
+          pf_iterator;
   pf_iterator pf_begin() const { return PatternFragments.begin(); }
   pf_iterator pf_end() const { return PatternFragments.end(); }