6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-09-25 17:20:48 +00:00
Code Issues Projects Releases Wiki Activity

Add new DSGraph::ScalarMapTy typedef to avoid pulling representation issues

Browse Source 
into callers of getScalarMap


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6944 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2003-06-28 21:57:13 +00:00
parent 2769e6ca92
commit 35de11f3b1
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/llvm/Analysis/DSGraph.h
View File

@@ -12,14 +12,18 @@
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
/// DSGraph - The graph that represents a function. /// DSGraph - The graph that represents a function.
/// ///
class DSGraph { struct DSGraph {
// Public data-type declarations...
typedef hash_map<Value*, DSNodeHandle> ScalarMapTy;
private:
Function *Func; // Func - The LLVM function this graph corresponds to Function *Func; // Func - The LLVM function this graph corresponds to
DSGraph *GlobalsGraph; // Pointer to the common graph of global objects DSGraph *GlobalsGraph; // Pointer to the common graph of global objects
bool PrintAuxCalls; // Should this graph print the Aux calls vector? bool PrintAuxCalls; // Should this graph print the Aux calls vector?
DSNodeHandle RetNode; // The node that gets returned... DSNodeHandle RetNode; // The node that gets returned...
std::vector<DSNode*> Nodes; std::vector<DSNode*> Nodes;
hash_map<Value*, DSNodeHandle> ScalarMap; ScalarMapTy ScalarMap;
// FunctionCalls - This vector maintains a single entry for each call // FunctionCalls - This vector maintains a single entry for each call
// instruction in the current graph. The first entry in the vector is the // instruction in the current graph. The first entry in the vector is the
@@ -80,8 +84,8 @@ public:
/// getScalarMap - Get a map that describes what the nodes the scalars in this /// getScalarMap - Get a map that describes what the nodes the scalars in this
/// function point to... /// function point to...
/// ///
hash_map<Value*, DSNodeHandle> &getScalarMap() { return ScalarMap; } ScalarMapTy &getScalarMap() { return ScalarMap; }
const hash_map<Value*, DSNodeHandle> &getScalarMap() const {return ScalarMap;} const ScalarMapTy &getScalarMap() const {return ScalarMap;}
/// getFunctionCalls - Return the list of call sites in the original local /// getFunctionCalls - Return the list of call sites in the original local
/// graph... /// graph...
@@ -106,7 +110,7 @@ public:
DSNodeHandle &getNodeForValue(Value *V) { return ScalarMap[V]; } DSNodeHandle &getNodeForValue(Value *V) { return ScalarMap[V]; }
const DSNodeHandle &getNodeForValue(Value *V) const { const DSNodeHandle &getNodeForValue(Value *V) const {
hash_map<Value*, DSNodeHandle>::const_iterator I = ScalarMap.find(V); ScalarMapTy::const_iterator I = ScalarMap.find(V);
assert(I != ScalarMap.end() && assert(I != ScalarMap.end() &&
"Use non-const lookup function if node may not be in the map"); "Use non-const lookup function if node may not be in the map");
return I->second; return I->second;
@@ -181,8 +185,7 @@ public:
// 'StripAllocaBit', Alloca markers are removed from the graph as the graph is // 'StripAllocaBit', Alloca markers are removed from the graph as the graph is
// being cloned. // being cloned.
// //
DSNodeHandle cloneInto(const DSGraph &G, DSNodeHandle cloneInto(const DSGraph &G, ScalarMapTy &OldValMap,
hash_map<Value*, DSNodeHandle> &OldValMap,
hash_map<const DSNode*, DSNodeHandle> &OldNodeMap, hash_map<const DSNode*, DSNodeHandle> &OldNodeMap,
unsigned CloneFlags = 0); unsigned CloneFlags = 0);

17
include/llvm/Analysis/DataStructure/DSGraph.h
View File

@@ -12,14 +12,18 @@
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
/// DSGraph - The graph that represents a function. /// DSGraph - The graph that represents a function.
/// ///
class DSGraph { struct DSGraph {
// Public data-type declarations...
typedef hash_map<Value*, DSNodeHandle> ScalarMapTy;
private:
Function *Func; // Func - The LLVM function this graph corresponds to Function *Func; // Func - The LLVM function this graph corresponds to
DSGraph *GlobalsGraph; // Pointer to the common graph of global objects DSGraph *GlobalsGraph; // Pointer to the common graph of global objects
bool PrintAuxCalls; // Should this graph print the Aux calls vector? bool PrintAuxCalls; // Should this graph print the Aux calls vector?
DSNodeHandle RetNode; // The node that gets returned... DSNodeHandle RetNode; // The node that gets returned...
std::vector<DSNode*> Nodes; std::vector<DSNode*> Nodes;
hash_map<Value*, DSNodeHandle> ScalarMap; ScalarMapTy ScalarMap;
// FunctionCalls - This vector maintains a single entry for each call // FunctionCalls - This vector maintains a single entry for each call
// instruction in the current graph. The first entry in the vector is the // instruction in the current graph. The first entry in the vector is the
@@ -80,8 +84,8 @@ public:
/// getScalarMap - Get a map that describes what the nodes the scalars in this /// getScalarMap - Get a map that describes what the nodes the scalars in this
/// function point to... /// function point to...
/// ///
hash_map<Value*, DSNodeHandle> &getScalarMap() { return ScalarMap; } ScalarMapTy &getScalarMap() { return ScalarMap; }
const hash_map<Value*, DSNodeHandle> &getScalarMap() const {return ScalarMap;} const ScalarMapTy &getScalarMap() const {return ScalarMap;}
/// getFunctionCalls - Return the list of call sites in the original local /// getFunctionCalls - Return the list of call sites in the original local
/// graph... /// graph...
@@ -106,7 +110,7 @@ public:
DSNodeHandle &getNodeForValue(Value *V) { return ScalarMap[V]; } DSNodeHandle &getNodeForValue(Value *V) { return ScalarMap[V]; }
const DSNodeHandle &getNodeForValue(Value *V) const { const DSNodeHandle &getNodeForValue(Value *V) const {
hash_map<Value*, DSNodeHandle>::const_iterator I = ScalarMap.find(V); ScalarMapTy::const_iterator I = ScalarMap.find(V);
assert(I != ScalarMap.end() && assert(I != ScalarMap.end() &&
"Use non-const lookup function if node may not be in the map"); "Use non-const lookup function if node may not be in the map");
return I->second; return I->second;
@@ -181,8 +185,7 @@ public:
// 'StripAllocaBit', Alloca markers are removed from the graph as the graph is // 'StripAllocaBit', Alloca markers are removed from the graph as the graph is
// being cloned. // being cloned.
// //
DSNodeHandle cloneInto(const DSGraph &G, DSNodeHandle cloneInto(const DSGraph &G, ScalarMapTy &OldValMap,
hash_map<Value*, DSNodeHandle> &OldValMap,
hash_map<const DSNode*, DSNodeHandle> &OldNodeMap, hash_map<const DSNode*, DSNodeHandle> &OldNodeMap,
unsigned CloneFlags = 0); unsigned CloneFlags = 0);