*** empty log message ***

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

diff --git a/include/llvm/CodeGen/MachineCodeForMethod.h b/include/llvm/CodeGen/MachineCodeForMethod.h
index fb9eaf8fe92fd4c47117ab4701250c002f0b55ed..e1b8e4f1f590c92ff48d21f9ca23fb17e4ab7f36 100644 (file)
--- a/include/llvm/CodeGen/MachineCodeForMethod.h
+++ b/include/llvm/CodeGen/MachineCodeForMethod.h
@@ -12,7 +12,7 @@
 #include "llvm/Annotation.h"
 #include "Support/NonCopyable.h"
 #include "Support/HashExtras.h"
-#include <ext/hash_set>
+#include <Support/hash_set>
 class Value;
 class Function;
 class Constant;

diff --git a/include/llvm/CodeGen/MachineFunction.h b/include/llvm/CodeGen/MachineFunction.h
index fb9eaf8fe92fd4c47117ab4701250c002f0b55ed..e1b8e4f1f590c92ff48d21f9ca23fb17e4ab7f36 100644 (file)
--- a/include/llvm/CodeGen/MachineFunction.h
+++ b/include/llvm/CodeGen/MachineFunction.h
@@ -12,7 +12,7 @@
 #include "llvm/Annotation.h"
 #include "Support/NonCopyable.h"
 #include "Support/HashExtras.h"
-#include <ext/hash_set>
+#include <Support/hash_set>
 class Value;
 class Function;
 class Constant;

diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h
index 2c183e1da93be3313c2c091a18539165c7202356..c81eb87e73de4f71109d56c870c34ad0250d5a60 100644 (file)
--- a/include/llvm/CodeGen/MachineInstr.h
+++ b/include/llvm/CodeGen/MachineInstr.h
@@ -12,10 +12,9 @@
 #include "llvm/Target/MachineInstrInfo.h"
 #include "llvm/Annotation.h"
 #include <iterator>
-#include <ext/hash_set>
+#include <Support/hash_set>
 class Instruction;
 using std::vector;
-using std::hash_set;
 
 //---------------------------------------------------------------------------
 // class MachineOperand 

diff --git a/include/llvm/Target/TargetRegInfo.h b/include/llvm/Target/TargetRegInfo.h
index 7ec5ee26b0c33636648059c15f60ead0746ef621..4f809bfb158e698896e3f59eb5b2a554f7bfff61 100644 (file)
--- a/include/llvm/Target/TargetRegInfo.h
+++ b/include/llvm/Target/TargetRegInfo.h
@@ -9,7 +9,7 @@
 #define LLVM_TARGET_MACHINEREGINFO_H
 
 #include "Support/NonCopyable.h"
-#include <ext/hash_map>
+#include <Support/hash_map>
 #include <string>
 
 class TargetMachine;

diff --git a/include/llvm/Target/TargetSchedInfo.h b/include/llvm/Target/TargetSchedInfo.h
index 12539b686f2e82600fc8d028ee81f57c9e817812..ba065cba094d07d01bf455d3e7cca0af7f190e0c 100644 (file)
--- a/include/llvm/Target/TargetSchedInfo.h
+++ b/include/llvm/Target/TargetSchedInfo.h
@@ -7,8 +7,8 @@
 #ifndef LLVM_TARGET_MACHINESCHEDINFO_H
 #define LLVM_TARGET_MACHINESCHEDINFO_H
 
-#include <ext/hash_map>
 #include "llvm/Target/MachineInstrInfo.h"
+#include <Support/hash_map>
 
 typedef long long cycles_t; 
 static const cycles_t HUGE_LATENCY = ~((long long) 1 << (sizeof(cycles_t)-2));

diff --git a/lib/CodeGen/InstrSched/InstrScheduling.cpp b/lib/CodeGen/InstrSched/InstrScheduling.cpp
index 1d4c18058f3dc9598d9d29428d7f85bc1da93a1e..2271c780a3cdea79398eac7c817bd6fefab0cd67 100644 (file)
--- a/lib/CodeGen/InstrSched/InstrScheduling.cpp
+++ b/lib/CodeGen/InstrSched/InstrScheduling.cpp
@@ -352,18 +352,18 @@ private:
   unsigned int totalInstrCount;
   cycles_t curTime;
   cycles_t nextEarliestIssueTime;              // next cycle we can issue
-  vector<std::hash_set<const SchedGraphNode*> > choicesForSlot; // indexed by slot#
+  vector<hash_set<const SchedGraphNode*> > choicesForSlot; // indexed by slot#
   vector<const SchedGraphNode*> choiceVec;     // indexed by node ptr
   vector<int> numInClass;                      // indexed by sched class
   vector<cycles_t> nextEarliestStartTime;      // indexed by opCode
-  std::hash_map<const SchedGraphNode*, DelaySlotInfo*> delaySlotInfoForBranches;
+  hash_map<const SchedGraphNode*, DelaySlotInfo*> delaySlotInfoForBranches;
                                                // indexed by branch node ptr 
   
 public:
   SchedulingManager(const TargetMachine& _target, const SchedGraph* graph,
                     SchedPriorities& schedPrio);
   ~SchedulingManager() {
-    for (std::hash_map<const SchedGraphNode*,
+    for (hash_map<const SchedGraphNode*,
            DelaySlotInfo*>::iterator I = delaySlotInfoForBranches.begin(),
            E = delaySlotInfoForBranches.end(); I != E; ++I)
       delete I->second;
@@ -422,7 +422,7 @@ public:
     return choiceVec[i];
   }
   
-  inline std::hash_set<const SchedGraphNode*>& getChoicesForSlot(unsigned slotNum) {
+  inline hash_set<const SchedGraphNode*>& getChoicesForSlot(unsigned slotNum) {
     assert(slotNum < nslots);
     return choicesForSlot[slotNum];
   }
@@ -497,7 +497,7 @@ public:
   inline DelaySlotInfo* getDelaySlotInfoForInstr(const SchedGraphNode* bn,
                                                 bool createIfMissing=false)
   {
-    std::hash_map<const SchedGraphNode*, DelaySlotInfo*>::const_iterator
+    hash_map<const SchedGraphNode*, DelaySlotInfo*>::const_iterator
       I = delaySlotInfoForBranches.find(bn);
     if (I != delaySlotInfoForBranches.end())
       return I->second;

diff --git a/lib/CodeGen/InstrSched/SchedGraph.cpp b/lib/CodeGen/InstrSched/SchedGraph.cpp
index 96962ced14fd4eca6ddceb13db271b143db9e970..8a9c8e573b3b10dede15c35150b7f40b0b4093cf 100644 (file)
--- a/lib/CodeGen/InstrSched/SchedGraph.cpp
+++ b/lib/CodeGen/InstrSched/SchedGraph.cpp
@@ -27,7 +27,6 @@
 
 using std::vector;
 using std::pair;
-using std::hash_map;
 using std::cerr;
 
 //*********************** Internal Data Structures *************************/

diff --git a/lib/CodeGen/InstrSched/SchedGraph.h b/lib/CodeGen/InstrSched/SchedGraph.h
index aa258813c37630dd528a20aadd8b2904100ffb3d..7db22d67346d600a45547f409f0e4fa8b56c3a15 100644 (file)
--- a/lib/CodeGen/InstrSched/SchedGraph.h
+++ b/lib/CodeGen/InstrSched/SchedGraph.h
@@ -211,14 +211,14 @@ private:
 
 class SchedGraph :
   public NonCopyable,
-  private std::hash_map<const MachineInstr*, SchedGraphNode*>
+  private hash_map<const MachineInstr*, SchedGraphNode*>
 {
 private:
   std::vector<const BasicBlock*> bbVec; // basic blocks included in the graph
   SchedGraphNode* graphRoot;           // the root and leaf are not inserted
   SchedGraphNode* graphLeaf;           //  in the hash_map (see getNumNodes())
   
-  typedef std::hash_map<const MachineInstr*, SchedGraphNode*> map_base;
+  typedef hash_map<const MachineInstr*, SchedGraphNode*> map_base;
 public:
   using map_base::iterator;
   using map_base::const_iterator;

diff --git a/lib/CodeGen/InstrSched/SchedPriorities.cpp b/lib/CodeGen/InstrSched/SchedPriorities.cpp
index 8a1c9a534842bfa52d71bc00ad914d87d6bad7a6..6277576c23b9e5b417421149827328c3214290a6 100644 (file)
--- a/lib/CodeGen/InstrSched/SchedPriorities.cpp
+++ b/lib/CodeGen/InstrSched/SchedPriorities.cpp
@@ -270,7 +270,7 @@ SchedPriorities::instructionHasLastUse(FunctionLiveVarInfo &LVI,
                                       const SchedGraphNode* graphNode) {
   const MachineInstr *MI = graphNode->getMachineInstr();
   
-  std::hash_map<const MachineInstr*, bool>::const_iterator
+  hash_map<const MachineInstr*, bool>::const_iterator
     ui = lastUseMap.find(MI);
   if (ui != lastUseMap.end())
     return ui->second;

diff --git a/lib/CodeGen/InstrSched/SchedPriorities.h b/lib/CodeGen/InstrSched/SchedPriorities.h
index f5c29b27e328d74e1ee7e4dbf8a8871df87b7204..b01c1a43d6803b6dd0f3bd26fcadf728390cac35 100644 (file)
--- a/lib/CodeGen/InstrSched/SchedPriorities.h
+++ b/lib/CodeGen/InstrSched/SchedPriorities.h
@@ -25,7 +25,7 @@
 #include "llvm/CodeGen/InstrScheduling.h"
 #include "llvm/Target/MachineSchedInfo.h"
 #include <list>
-#include <ext/hash_set>
+#include <Support/hash_set>
 #include <iostream>
 class Function;
 class MachineInstr;

diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp
index a435be646b88cf04ff3b43baf44aefc77def6326..ce39b45f12c6c9759a0f0e4041f4b8b6f1299772 100644 (file)
--- a/lib/CodeGen/MachineFunction.cpp
+++ b/lib/CodeGen/MachineFunction.cpp
@@ -266,7 +266,7 @@ MachineCodeForMethod::popAllTempValues(const TargetMachine& target)
 int
 MachineCodeForMethod::getOffset(const Value* val) const
 {
-  std::hash_map<const Value*, int>::const_iterator pair = offsets.find(val);
+  hash_map<const Value*, int>::const_iterator pair = offsets.find(val);
   return (pair == offsets.end())? INVALID_FRAME_OFFSET : pair->second;
 }
 

diff --git a/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp b/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp
index 1d4c18058f3dc9598d9d29428d7f85bc1da93a1e..2271c780a3cdea79398eac7c817bd6fefab0cd67 100644 (file)
--- a/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp
+++ b/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp
@@ -352,18 +352,18 @@ private:
   unsigned int totalInstrCount;
   cycles_t curTime;
   cycles_t nextEarliestIssueTime;              // next cycle we can issue
-  vector<std::hash_set<const SchedGraphNode*> > choicesForSlot; // indexed by slot#
+  vector<hash_set<const SchedGraphNode*> > choicesForSlot; // indexed by slot#
   vector<const SchedGraphNode*> choiceVec;     // indexed by node ptr
   vector<int> numInClass;                      // indexed by sched class
   vector<cycles_t> nextEarliestStartTime;      // indexed by opCode
-  std::hash_map<const SchedGraphNode*, DelaySlotInfo*> delaySlotInfoForBranches;
+  hash_map<const SchedGraphNode*, DelaySlotInfo*> delaySlotInfoForBranches;
                                                // indexed by branch node ptr 
   
 public:
   SchedulingManager(const TargetMachine& _target, const SchedGraph* graph,
                     SchedPriorities& schedPrio);
   ~SchedulingManager() {
-    for (std::hash_map<const SchedGraphNode*,
+    for (hash_map<const SchedGraphNode*,
            DelaySlotInfo*>::iterator I = delaySlotInfoForBranches.begin(),
            E = delaySlotInfoForBranches.end(); I != E; ++I)
       delete I->second;
@@ -422,7 +422,7 @@ public:
     return choiceVec[i];
   }
   
-  inline std::hash_set<const SchedGraphNode*>& getChoicesForSlot(unsigned slotNum) {
+  inline hash_set<const SchedGraphNode*>& getChoicesForSlot(unsigned slotNum) {
     assert(slotNum < nslots);
     return choicesForSlot[slotNum];
   }
@@ -497,7 +497,7 @@ public:
   inline DelaySlotInfo* getDelaySlotInfoForInstr(const SchedGraphNode* bn,
                                                 bool createIfMissing=false)
   {
-    std::hash_map<const SchedGraphNode*, DelaySlotInfo*>::const_iterator
+    hash_map<const SchedGraphNode*, DelaySlotInfo*>::const_iterator
       I = delaySlotInfoForBranches.find(bn);
     if (I != delaySlotInfoForBranches.end())
       return I->second;

diff --git a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp b/lib/Target/SparcV9/InstrSched/SchedGraph.cpp
index 96962ced14fd4eca6ddceb13db271b143db9e970..8a9c8e573b3b10dede15c35150b7f40b0b4093cf 100644 (file)
--- a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp
+++ b/lib/Target/SparcV9/InstrSched/SchedGraph.cpp
@@ -27,7 +27,6 @@
 
 using std::vector;
 using std::pair;
-using std::hash_map;
 using std::cerr;
 
 //*********************** Internal Data Structures *************************/

diff --git a/lib/Target/SparcV9/InstrSched/SchedGraph.h b/lib/Target/SparcV9/InstrSched/SchedGraph.h
index aa258813c37630dd528a20aadd8b2904100ffb3d..7db22d67346d600a45547f409f0e4fa8b56c3a15 100644 (file)
--- a/lib/Target/SparcV9/InstrSched/SchedGraph.h
+++ b/lib/Target/SparcV9/InstrSched/SchedGraph.h
@@ -211,14 +211,14 @@ private:
 
 class SchedGraph :
   public NonCopyable,
-  private std::hash_map<const MachineInstr*, SchedGraphNode*>
+  private hash_map<const MachineInstr*, SchedGraphNode*>
 {
 private:
   std::vector<const BasicBlock*> bbVec; // basic blocks included in the graph
   SchedGraphNode* graphRoot;           // the root and leaf are not inserted
   SchedGraphNode* graphLeaf;           //  in the hash_map (see getNumNodes())
   
-  typedef std::hash_map<const MachineInstr*, SchedGraphNode*> map_base;
+  typedef hash_map<const MachineInstr*, SchedGraphNode*> map_base;
 public:
   using map_base::iterator;
   using map_base::const_iterator;

diff --git a/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp b/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp
index 8a1c9a534842bfa52d71bc00ad914d87d6bad7a6..6277576c23b9e5b417421149827328c3214290a6 100644 (file)
--- a/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp
+++ b/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp
@@ -270,7 +270,7 @@ SchedPriorities::instructionHasLastUse(FunctionLiveVarInfo &LVI,
                                       const SchedGraphNode* graphNode) {
   const MachineInstr *MI = graphNode->getMachineInstr();
   
-  std::hash_map<const MachineInstr*, bool>::const_iterator
+  hash_map<const MachineInstr*, bool>::const_iterator
     ui = lastUseMap.find(MI);
   if (ui != lastUseMap.end())
     return ui->second;

diff --git a/lib/Target/SparcV9/InstrSched/SchedPriorities.h b/lib/Target/SparcV9/InstrSched/SchedPriorities.h
index f5c29b27e328d74e1ee7e4dbf8a8871df87b7204..b01c1a43d6803b6dd0f3bd26fcadf728390cac35 100644 (file)
--- a/lib/Target/SparcV9/InstrSched/SchedPriorities.h
+++ b/lib/Target/SparcV9/InstrSched/SchedPriorities.h
@@ -25,7 +25,7 @@
 #include "llvm/CodeGen/InstrScheduling.h"
 #include "llvm/Target/MachineSchedInfo.h"
 #include <list>
-#include <ext/hash_set>
+#include <Support/hash_set>
 #include <iostream>
 class Function;
 class MachineInstr;

diff --git a/lib/Target/SparcV9/SparcV9AsmPrinter.cpp b/lib/Target/SparcV9/SparcV9AsmPrinter.cpp
index 34d80b1e8656b359d4d397e24f6f6d4ccfc7436b..e58a0c2324fd62b528404fadc8103b8e973bb28a 100644 (file)
--- a/lib/Target/SparcV9/SparcV9AsmPrinter.cpp
+++ b/lib/Target/SparcV9/SparcV9AsmPrinter.cpp
@@ -34,7 +34,7 @@ class GlobalIdTable: public Annotation {
   static AnnotationID AnnotId;
   friend class AsmPrinter;              // give access to AnnotId
   
-  typedef std::hash_map<const Value*, int> ValIdMap;
+  typedef hash_map<const Value*, int> ValIdMap;
   typedef ValIdMap::const_iterator ValIdMapConstIterator;
   typedef ValIdMap::      iterator ValIdMapIterator;
 public:
@@ -474,7 +474,7 @@ private:
   void printConstant(         const Constant* CV, std::string valID = "");
 
   static void FoldConstants(const Module &M,
-                            std::hash_set<const Constant*> &moduleConstants);
+                            hash_set<const Constant*> &moduleConstants);
 };
 
 
@@ -741,10 +741,10 @@ SparcModuleAsmPrinter::printConstant(const Constant* CV, string valID)
 
 
 void SparcModuleAsmPrinter::FoldConstants(const Module &M,
-                                          std::hash_set<const Constant*> &MC) {
+                                          hash_set<const Constant*> &MC) {
   for (Module::const_iterator I = M.begin(), E = M.end(); I != E; ++I)
     if (!I->isExternal()) {
-      const std::hash_set<const Constant*> &pool =
+      const hash_set<const Constant*> &pool =
         MachineCodeForMethod::get(I).getConstantPoolValues();
       MC.insert(pool.begin(), pool.end());
     }
@@ -774,7 +774,7 @@ void SparcModuleAsmPrinter::emitGlobalsAndConstants(const Module &M) {
   // lets force these constants into the slot table so that we can get
   // unique names for unnamed constants also.
   // 
-  std::hash_set<const Constant*> moduleConstants;
+  hash_set<const Constant*> moduleConstants;
   FoldConstants(M, moduleConstants);
     
   // Now, emit the three data sections separately; the cost of I/O should
@@ -786,7 +786,7 @@ void SparcModuleAsmPrinter::emitGlobalsAndConstants(const Module &M) {
     if (GI->hasInitializer() && GI->isConstant())
       printGlobalVariable(GI);
   
-  for (std::hash_set<const Constant*>::const_iterator
+  for (hash_set<const Constant*>::const_iterator
          I = moduleConstants.begin(),
          E = moduleConstants.end();  I != E; ++I)
     printConstant(*I);

diff --git a/lib/Target/SparcV9/SparcV9InstrSelection.cpp b/lib/Target/SparcV9/SparcV9InstrSelection.cpp
index ea1ddea881f8001dc00079789298651233ee7a21..8783a1e86e5954d66c44f4cae534fd06cfb28c62 100644 (file)
--- a/lib/Target/SparcV9/SparcV9InstrSelection.cpp
+++ b/lib/Target/SparcV9/SparcV9InstrSelection.cpp
@@ -148,7 +148,7 @@ ChooseBFpccInstruction(const InstructionNode* instrNode,
 static TmpInstruction*
 GetTmpForCC(Value* boolVal, const Function *F, const Type* ccType)
 {
-  typedef std::hash_map<const Value*, TmpInstruction*> BoolTmpCache;
+  typedef hash_map<const Value*, TmpInstruction*> BoolTmpCache;
   static BoolTmpCache boolToTmpCache;     // Map boolVal -> TmpInstruction*
   static const Function *lastFunction = 0;// Use to flush cache between funcs
   

diff --git a/lib/Target/SparcV9/SparcV9RegInfo.cpp b/lib/Target/SparcV9/SparcV9RegInfo.cpp
index 11b65f8cab03c8b248cb2b8656d2660816483054..c321adc25fb6f25fa1b63c9133603e0ac4ed26d2 100644 (file)
--- a/lib/Target/SparcV9/SparcV9RegInfo.cpp
+++ b/lib/Target/SparcV9/SparcV9RegInfo.cpp
@@ -1317,7 +1317,7 @@ UltraSparcRegInfo::insertCallerSavingCode(vector<MachineInstr*>& instrnsBefore,
   
   // has set to record which registers were saved/restored
   //
-  std::hash_set<unsigned> PushedRegSet;
+  hash_set<unsigned> PushedRegSet;
 
   CallArgsDescriptor* argDesc = CallArgsDescriptor::get(CallMI);