* Remove a lot of obsolete #if 0'd code

 * Add a simple getNodeForValue method to access the ValueMap.

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

diff --git a/include/llvm/Analysis/DSGraph.h b/include/llvm/Analysis/DSGraph.h
index 4995b11bdd3978dbce01213bd5e53a13d3f9ea33..fce442ebc5f7ff29ab20c40d1a756c59c3b4cea4 100644 (file)
--- a/include/llvm/Analysis/DSGraph.h
+++ b/include/llvm/Analysis/DSGraph.h
@@ -347,37 +347,6 @@ class DSGraph {
   //
   std::vector<std::vector<DSNodeHandle> > FunctionCalls;
 
-#if 0
-  // OrigFunctionCalls - This vector retains a copy of the original function
-  // calls of the current graph.  This is needed to support top-down inlining
-  // after bottom-up inlining is complete, since the latter deletes call nodes.
-  // 
-  std::vector<std::vector<DSNodeHandle> > OrigFunctionCalls;
-
-  // PendingCallers - This vector records all unresolved callers of the
-  // current function, i.e., ones whose graphs have not been inlined into
-  // the current graph.  As long as there are unresolved callers, the nodes
-  // for formal arguments in the current graph cannot be eliminated, and
-  // nodes in the graph reachable from the formal argument nodes or
-  // global variable nodes must be considered incomplete. 
-  std::set<Function*> PendingCallers;
-#endif
-  
-protected:
-
-#if 0
-  // clone all the call nodes and save the copies in OrigFunctionCalls
-  void saveOrigFunctionCalls() {
-    assert(OrigFunctionCalls.size() == 0 && "Do this only once!");
-    OrigFunctionCalls = FunctionCalls;
-  }
-
-  // get the saved copies of the original function call nodes
-  std::vector<std::vector<DSNodeHandle> > &getOrigFunctionCalls() {
-    return OrigFunctionCalls;
-  }
-#endif
-
   void operator=(const DSGraph &); // DO NOT IMPLEMENT
 public:
   DSGraph() : Func(0) {}           // Create a new, empty, DSGraph.
@@ -410,6 +379,11 @@ public:
     return FunctionCalls;
   }
 
+  /// getNodeForValue - Given a value that is used or defined in the body of the
+  /// current function, return the DSNode that it points to.
+  ///
+  DSNodeHandle &getNodeForValue(Value *V) { return ValueMap[V]; }
+
   const DSNodeHandle &getRetNode() const { return RetNode; }
         DSNodeHandle &getRetNode()       { return RetNode; }
 
@@ -452,20 +426,6 @@ public:
   //
   void removeDeadNodes(bool KeepAllGlobals = false, bool KeepCalls = true);
 
-#if 0
-  // AddCaller - add a known caller node into the graph and mark it pending.
-  // getCallers - get a vector of the functions that call this one
-  // getCallersPending - get a matching vector of bools indicating if each
-  //                     caller's DSGraph has been resolved into this one.
-  // 
-  void addCaller(Function &caller) {
-    PendingCallers.insert(&caller);
-  }
-  std::set<Function*> &getPendingCallers() {
-    return PendingCallers;
-  }
-#endif
-
   // cloneInto - Clone the specified DSGraph into the current graph, returning
   // the Return node of the graph.  The translated ValueMap for the old function
   // is filled into the OldValMap member.

diff --git a/include/llvm/Analysis/DataStructure/DSGraph.h b/include/llvm/Analysis/DataStructure/DSGraph.h
index 4995b11bdd3978dbce01213bd5e53a13d3f9ea33..fce442ebc5f7ff29ab20c40d1a756c59c3b4cea4 100644 (file)
--- a/include/llvm/Analysis/DataStructure/DSGraph.h
+++ b/include/llvm/Analysis/DataStructure/DSGraph.h
@@ -347,37 +347,6 @@ class DSGraph {
   //
   std::vector<std::vector<DSNodeHandle> > FunctionCalls;
 
-#if 0
-  // OrigFunctionCalls - This vector retains a copy of the original function
-  // calls of the current graph.  This is needed to support top-down inlining
-  // after bottom-up inlining is complete, since the latter deletes call nodes.
-  // 
-  std::vector<std::vector<DSNodeHandle> > OrigFunctionCalls;
-
-  // PendingCallers - This vector records all unresolved callers of the
-  // current function, i.e., ones whose graphs have not been inlined into
-  // the current graph.  As long as there are unresolved callers, the nodes
-  // for formal arguments in the current graph cannot be eliminated, and
-  // nodes in the graph reachable from the formal argument nodes or
-  // global variable nodes must be considered incomplete. 
-  std::set<Function*> PendingCallers;
-#endif
-  
-protected:
-
-#if 0
-  // clone all the call nodes and save the copies in OrigFunctionCalls
-  void saveOrigFunctionCalls() {
-    assert(OrigFunctionCalls.size() == 0 && "Do this only once!");
-    OrigFunctionCalls = FunctionCalls;
-  }
-
-  // get the saved copies of the original function call nodes
-  std::vector<std::vector<DSNodeHandle> > &getOrigFunctionCalls() {
-    return OrigFunctionCalls;
-  }
-#endif
-
   void operator=(const DSGraph &); // DO NOT IMPLEMENT
 public:
   DSGraph() : Func(0) {}           // Create a new, empty, DSGraph.
@@ -410,6 +379,11 @@ public:
     return FunctionCalls;
   }
 
+  /// getNodeForValue - Given a value that is used or defined in the body of the
+  /// current function, return the DSNode that it points to.
+  ///
+  DSNodeHandle &getNodeForValue(Value *V) { return ValueMap[V]; }
+
   const DSNodeHandle &getRetNode() const { return RetNode; }
         DSNodeHandle &getRetNode()       { return RetNode; }
 
@@ -452,20 +426,6 @@ public:
   //
   void removeDeadNodes(bool KeepAllGlobals = false, bool KeepCalls = true);
 
-#if 0
-  // AddCaller - add a known caller node into the graph and mark it pending.
-  // getCallers - get a vector of the functions that call this one
-  // getCallersPending - get a matching vector of bools indicating if each
-  //                     caller's DSGraph has been resolved into this one.
-  // 
-  void addCaller(Function &caller) {
-    PendingCallers.insert(&caller);
-  }
-  std::set<Function*> &getPendingCallers() {
-    return PendingCallers;
-  }
-#endif
-
   // cloneInto - Clone the specified DSGraph into the current graph, returning
   // the Return node of the graph.  The translated ValueMap for the old function
   // is filled into the OldValMap member.