6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-18 14:31:27 +00:00
Code Issues Projects Releases Wiki Activity

Eliminate unused resolving caller stuff

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@5475 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2003-02-03 19:11:04 +00:00
parent f9962812d0
commit 5a939029d5
2 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/llvm/Analysis/DSSupport.h
View File

@ -47,6 +47,7 @@ namespace DS { // FIXME: After the paper, this should get cleaned up
class DSNodeHandle { class DSNodeHandle {
DSNode *N; DSNode *N;
unsigned Offset; unsigned Offset;
void operator==(const DSNode *N); // DISALLOW, use to promote N to nodehandle
public: public:
// Allow construction, destruction, and assignment... // Allow construction, destruction, and assignment...
DSNodeHandle(DSNode *n = 0, unsigned offs = 0) : N(0), Offset(offs) { DSNodeHandle(DSNode *n = 0, unsigned offs = 0) : N(0), Offset(offs) {
@ -103,19 +104,12 @@ inline void swap(DSNodeHandle &NH1, DSNodeHandle &NH2) { NH1.swap(NH2); }
/// DSCallSite - Representation of a call site via its call instruction, /// DSCallSite - Representation of a call site via its call instruction,
/// the DSNode handle for the callee function (or function pointer), and /// the DSNode handle for the callee function (or function pointer), and
/// the DSNode handles for the function arguments. /// the DSNode handles for the function arguments.
///
/// One unusual aspect of this callsite record is the ResolvingCaller member.
/// If this is non-null, then it indicates the function that allowed a call-site
/// to finally be resolved. Because of indirect calls, this function may not
/// actually be the function that contains the Call instruction itself. This is
/// used by the BU and TD passes to communicate.
/// ///
class DSCallSite { class DSCallSite {
CallInst *Inst; // Actual call site CallInst *Inst; // Actual call site
DSNodeHandle RetVal; // Returned value DSNodeHandle RetVal; // Returned value
DSNodeHandle Callee; // The function node called DSNodeHandle Callee; // The function node called
std::vector<DSNodeHandle> CallArgs; // The pointer arguments std::vector<DSNodeHandle> CallArgs; // The pointer arguments
Function *ResolvingCaller; // See comments above
static void InitNH(DSNodeHandle &NH, const DSNodeHandle &Src, static void InitNH(DSNodeHandle &NH, const DSNodeHandle &Src,
const hash_map<const DSNode*, DSNode*> &NodeMap) { const hash_map<const DSNode*, DSNode*> &NodeMap) {
@ -146,14 +140,13 @@ public:
/// ///
DSCallSite(CallInst &inst, const DSNodeHandle &rv, const DSNodeHandle &callee, DSCallSite(CallInst &inst, const DSNodeHandle &rv, const DSNodeHandle &callee,
std::vector<DSNodeHandle> &Args) std::vector<DSNodeHandle> &Args)
: Inst(&inst), RetVal(rv), Callee(callee), ResolvingCaller(0) { : Inst(&inst), RetVal(rv), Callee(callee) {
Args.swap(CallArgs); Args.swap(CallArgs);
} }
DSCallSite(const DSCallSite &DSCS) // Simple copy ctor DSCallSite(const DSCallSite &DSCS) // Simple copy ctor
: Inst(DSCS.Inst), RetVal(DSCS.RetVal), : Inst(DSCS.Inst), RetVal(DSCS.RetVal),
Callee(DSCS.Callee), CallArgs(DSCS.CallArgs), Callee(DSCS.Callee), CallArgs(DSCS.CallArgs) {}
ResolvingCaller(DSCS.ResolvingCaller) {}
/// Mapping copy constructor - This constructor takes a preexisting call site /// Mapping copy constructor - This constructor takes a preexisting call site
/// to copy plus a map that specifies how the links should be transformed. /// to copy plus a map that specifies how the links should be transformed.
@ -168,7 +161,6 @@ public:
CallArgs.resize(FromCall.CallArgs.size()); CallArgs.resize(FromCall.CallArgs.size());
for (unsigned i = 0, e = FromCall.CallArgs.size(); i != e; ++i) for (unsigned i = 0, e = FromCall.CallArgs.size(); i != e; ++i)
InitNH(CallArgs[i], FromCall.CallArgs[i], NodeMap); InitNH(CallArgs[i], FromCall.CallArgs[i], NodeMap);
ResolvingCaller = FromCall.ResolvingCaller;
} }
// Accessor functions... // Accessor functions...
@ -182,9 +174,6 @@ public:
unsigned getNumPtrArgs() const { return CallArgs.size(); } unsigned getNumPtrArgs() const { return CallArgs.size(); }
Function *getResolvingCaller() const { return ResolvingCaller; }
void setResolvingCaller(Function *F) { ResolvingCaller = F; }
DSNodeHandle &getPtrArg(unsigned i) { DSNodeHandle &getPtrArg(unsigned i) {
assert(i < CallArgs.size() && "Argument to getPtrArgNode is out of range!"); assert(i < CallArgs.size() && "Argument to getPtrArgNode is out of range!");
return CallArgs[i]; return CallArgs[i];
@ -200,7 +189,6 @@ public:
std::swap(RetVal, CS.RetVal); std::swap(RetVal, CS.RetVal);
std::swap(Callee, CS.Callee); std::swap(Callee, CS.Callee);
std::swap(CallArgs, CS.CallArgs); std::swap(CallArgs, CS.CallArgs);
std::swap(ResolvingCaller, CS.ResolvingCaller);
} }
} }

18
include/llvm/Analysis/DataStructure/DSSupport.h
View File

@ -47,6 +47,7 @@ namespace DS { // FIXME: After the paper, this should get cleaned up
class DSNodeHandle { class DSNodeHandle {
DSNode *N; DSNode *N;
unsigned Offset; unsigned Offset;
void operator==(const DSNode *N); // DISALLOW, use to promote N to nodehandle
public: public:
// Allow construction, destruction, and assignment... // Allow construction, destruction, and assignment...
DSNodeHandle(DSNode *n = 0, unsigned offs = 0) : N(0), Offset(offs) { DSNodeHandle(DSNode *n = 0, unsigned offs = 0) : N(0), Offset(offs) {
@ -103,19 +104,12 @@ inline void swap(DSNodeHandle &NH1, DSNodeHandle &NH2) { NH1.swap(NH2); }
/// DSCallSite - Representation of a call site via its call instruction, /// DSCallSite - Representation of a call site via its call instruction,
/// the DSNode handle for the callee function (or function pointer), and /// the DSNode handle for the callee function (or function pointer), and
/// the DSNode handles for the function arguments. /// the DSNode handles for the function arguments.
///
/// One unusual aspect of this callsite record is the ResolvingCaller member.
/// If this is non-null, then it indicates the function that allowed a call-site
/// to finally be resolved. Because of indirect calls, this function may not
/// actually be the function that contains the Call instruction itself. This is
/// used by the BU and TD passes to communicate.
/// ///
class DSCallSite { class DSCallSite {
CallInst *Inst; // Actual call site CallInst *Inst; // Actual call site
DSNodeHandle RetVal; // Returned value DSNodeHandle RetVal; // Returned value
DSNodeHandle Callee; // The function node called DSNodeHandle Callee; // The function node called
std::vector<DSNodeHandle> CallArgs; // The pointer arguments std::vector<DSNodeHandle> CallArgs; // The pointer arguments
Function *ResolvingCaller; // See comments above
static void InitNH(DSNodeHandle &NH, const DSNodeHandle &Src, static void InitNH(DSNodeHandle &NH, const DSNodeHandle &Src,
const hash_map<const DSNode*, DSNode*> &NodeMap) { const hash_map<const DSNode*, DSNode*> &NodeMap) {
@ -146,14 +140,13 @@ public:
/// ///
DSCallSite(CallInst &inst, const DSNodeHandle &rv, const DSNodeHandle &callee, DSCallSite(CallInst &inst, const DSNodeHandle &rv, const DSNodeHandle &callee,
std::vector<DSNodeHandle> &Args) std::vector<DSNodeHandle> &Args)
: Inst(&inst), RetVal(rv), Callee(callee), ResolvingCaller(0) { : Inst(&inst), RetVal(rv), Callee(callee) {
Args.swap(CallArgs); Args.swap(CallArgs);
} }
DSCallSite(const DSCallSite &DSCS) // Simple copy ctor DSCallSite(const DSCallSite &DSCS) // Simple copy ctor
: Inst(DSCS.Inst), RetVal(DSCS.RetVal), : Inst(DSCS.Inst), RetVal(DSCS.RetVal),
Callee(DSCS.Callee), CallArgs(DSCS.CallArgs), Callee(DSCS.Callee), CallArgs(DSCS.CallArgs) {}
ResolvingCaller(DSCS.ResolvingCaller) {}
/// Mapping copy constructor - This constructor takes a preexisting call site /// Mapping copy constructor - This constructor takes a preexisting call site
/// to copy plus a map that specifies how the links should be transformed. /// to copy plus a map that specifies how the links should be transformed.
@ -168,7 +161,6 @@ public:
CallArgs.resize(FromCall.CallArgs.size()); CallArgs.resize(FromCall.CallArgs.size());
for (unsigned i = 0, e = FromCall.CallArgs.size(); i != e; ++i) for (unsigned i = 0, e = FromCall.CallArgs.size(); i != e; ++i)
InitNH(CallArgs[i], FromCall.CallArgs[i], NodeMap); InitNH(CallArgs[i], FromCall.CallArgs[i], NodeMap);
ResolvingCaller = FromCall.ResolvingCaller;
} }
// Accessor functions... // Accessor functions...
@ -182,9 +174,6 @@ public:
unsigned getNumPtrArgs() const { return CallArgs.size(); } unsigned getNumPtrArgs() const { return CallArgs.size(); }
Function *getResolvingCaller() const { return ResolvingCaller; }
void setResolvingCaller(Function *F) { ResolvingCaller = F; }
DSNodeHandle &getPtrArg(unsigned i) { DSNodeHandle &getPtrArg(unsigned i) {
assert(i < CallArgs.size() && "Argument to getPtrArgNode is out of range!"); assert(i < CallArgs.size() && "Argument to getPtrArgNode is out of range!");
return CallArgs[i]; return CallArgs[i];
@ -200,7 +189,6 @@ public:
std::swap(RetVal, CS.RetVal); std::swap(RetVal, CS.RetVal);
std::swap(Callee, CS.Callee); std::swap(Callee, CS.Callee);
std::swap(CallArgs, CS.CallArgs); std::swap(CallArgs, CS.CallArgs);
std::swap(ResolvingCaller, CS.ResolvingCaller);
} }
} }