Rename DSGraph::ScalarMapTy -> DSScalarMap

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

diff --git a/lib/Analysis/DataStructure/DataStructure.cpp b/lib/Analysis/DataStructure/DataStructure.cpp
index d00199ef41f95f63c73422e11a8adba4bc08bb6a..983dcf92ec698c7b626c0234e11745f44138fb56 100644 (file)
--- a/lib/Analysis/DataStructure/DataStructure.cpp
+++ b/lib/Analysis/DataStructure/DataStructure.cpp
@@ -102,7 +102,7 @@ void DSNode::assertOK() const {
          "Node not OK!");
 
   assert(ParentGraph && "Node has no parent?");
-  const DSGraph::ScalarMapTy &SM = ParentGraph->getScalarMap();
+  const DSScalarMap &SM = ParentGraph->getScalarMap();
   for (unsigned i = 0, e = Globals.size(); i != e; ++i) {
     assert(SM.count(Globals[i]));
     assert(SM.find(Globals[i])->second.getNode() == this);
@@ -1067,7 +1067,7 @@ void DSGraph::updateFromGlobalGraph() {
   for (DSScalarMap::global_iterator I = getScalarMap().global_begin(),
          E = getScalarMap().global_end(); I != E; ++I)
     if (InlinedGlobals.count(*I) == 0) { // GNode is not up-to-date
-      ScalarMapTy::iterator It = GlobalsGraph->ScalarMap.find(*I);
+      DSScalarMap::iterator It = GlobalsGraph->ScalarMap.find(*I);
       if (It != GlobalsGraph->ScalarMap.end())
         RC.merge(getNodeForValue(*I), It->second);
     }
@@ -1079,7 +1079,7 @@ void DSGraph::updateFromGlobalGraph() {
 ///
 /// The CloneFlags member controls various aspects of the cloning process.
 ///
-void DSGraph::cloneInto(const DSGraph &G, ScalarMapTy &OldValMap,
+void DSGraph::cloneInto(const DSGraph &G, DSScalarMap &OldValMap,
                         ReturnNodesTy &OldReturnNodes, NodeMapTy &OldNodeMap,
                         unsigned CloneFlags) {
   TIME_REGION(X, "cloneInto");
@@ -1111,7 +1111,7 @@ void DSGraph::cloneInto(const DSGraph &G, ScalarMapTy &OldValMap,
     Nodes[i]->remapLinks(OldNodeMap);
 
   // Copy the scalar map... merging all of the global nodes...
-  for (ScalarMapTy::const_iterator I = G.ScalarMap.begin(),
+  for (DSScalarMap::const_iterator I = G.ScalarMap.begin(),
          E = G.ScalarMap.end(); I != E; ++I) {
     DSNodeHandle &MappedNode = OldNodeMap[I->second.getNode()];
     DSNodeHandle &H = OldValMap[I->first];
@@ -1464,7 +1464,7 @@ void DSGraph::removeTriviallyDeadNodes() {
 
   // Likewise, forward any edges from the scalar nodes.  While we are at it,
   // clean house a bit.
-  for (ScalarMapTy::iterator I = ScalarMap.begin(),E = ScalarMap.end();I != E;){
+  for (DSScalarMap::iterator I = ScalarMap.begin(),E = ScalarMap.end();I != E;){
     I->second.getNode();
     ++I;
   }
@@ -1616,7 +1616,7 @@ void DSGraph::removeDeadNodes(unsigned Flags) {
 
   // Mark all nodes reachable by (non-global) scalar nodes as alive...
   { TIME_REGION(Y, "removeDeadNodes:scalarscan");
-  for (ScalarMapTy::iterator I = ScalarMap.begin(), E = ScalarMap.end(); I !=E;)
+  for (DSScalarMap::iterator I = ScalarMap.begin(), E = ScalarMap.end(); I !=E;)
     if (isa<GlobalValue>(I->first)) {             // Keep track of global nodes
       assert(I->second.getNode() && "Null global node?");
       assert(I->second.getNode()->isGlobalNode() && "Should be a global node!");

diff --git a/lib/Analysis/DataStructure/Local.cpp b/lib/Analysis/DataStructure/Local.cpp
index 03ec74102688d883340d3d904dcfacbfb7abf22d..7d61d27b4662bd75df089b097c78a863336ec9f9 100644 (file)
--- a/lib/Analysis/DataStructure/Local.cpp
+++ b/lib/Analysis/DataStructure/Local.cpp
@@ -72,7 +72,7 @@ namespace {
   class GraphBuilder : InstVisitor<GraphBuilder> {
     DSGraph &G;
     DSNodeHandle *RetNode;               // Node that gets returned...
-    DSGraph::ScalarMapTy &ScalarMap;
+    DSScalarMap &ScalarMap;
     std::vector<DSCallSite> *FunctionCalls;
 
   public:
@@ -171,7 +171,7 @@ DSGraph::DSGraph(const TargetData &td, Function &F, DSGraph *GG)
 #endif
 
   // Remove all integral constants from the scalarmap!
-  for (ScalarMapTy::iterator I = ScalarMap.begin(); I != ScalarMap.end();)
+  for (DSScalarMap::iterator I = ScalarMap.begin(); I != ScalarMap.end();)
     if (isa<ConstantIntegral>(I->first))
       ScalarMap.erase(I++);
     else
@@ -210,7 +210,7 @@ DSNodeHandle GraphBuilder::getValueDest(Value &Val) {
         NH = getValueDest(*CE->getOperand(0));
       else if (CE->getOpcode() == Instruction::GetElementPtr) {
         visitGetElementPtrInst(*CE);
-        DSGraph::ScalarMapTy::iterator I = ScalarMap.find(CE);
+        DSScalarMap::iterator I = ScalarMap.find(CE);
         assert(I != ScalarMap.end() && "GEP didn't get processed right?");
         NH = I->second;
       } else {