6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-05 12:31:33 +00:00
Code Issues Projects Releases Wiki Activity

Simplify caller updating using a CallSite, as

Browse Source 
requested by Chris.  While there, do the same
for an existing function committed by someone
called "lattner" :)


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47273 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan Sands 2008-02-18 17:32:13 +00:00
parent bb494bcb0e
commit 548448a317
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/llvm/Support/CallSite.h
View File

@ -35,6 +35,7 @@ public:
CallSite() : I(0) {}
CallSite(CallInst *CI) : I(reinterpret_cast<Instruction*>(CI)) {}
CallSite(InvokeInst *II) : I(reinterpret_cast<Instruction*>(II)) {}
CallSite(Instruction *C);
CallSite(const CallSite &CS) : I(CS.I) {}
CallSite &operator=(const CallSite &CS) { I = CS.I; return *this; }

38
lib/Transforms/IPO/GlobalOpt.cpp
View File

@ -25,6 +25,7 @@
#include "llvm/Pass.h"
#include "llvm/Analysis/ConstantFolding.h"
#include "llvm/Target/TargetData.h"
#include "llvm/Support/CallSite.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/GetElementPtrTypeIterator.h"
@ -1584,25 +1585,23 @@ static bool OnlyCalledDirectly(Function *F) {
/// function, changing them to FastCC.
static void ChangeCalleesToFastCall(Function *F) {
for (Value::use_iterator UI = F->use_begin(), E = F->use_end(); UI != E;++UI){
Instruction *User = cast<Instruction>(*UI);
if (CallInst *CI = dyn_cast<CallInst>(User))
CI->setCallingConv(CallingConv::Fast);
else
cast<InvokeInst>(User)->setCallingConv(CallingConv::Fast);
CallSite User(cast<Instruction>(*UI));
User.setCallingConv(CallingConv::Fast);
}
}
static const ParamAttrsList *StripNest(const ParamAttrsList *Attrs) {
if (Attrs) {
for (unsigned i = 0, e = Attrs->size(); i != e; ++i) {
uint16_t A = Attrs->getParamAttrsAtIndex(i);
if (A & ParamAttr::Nest) {
Attrs = ParamAttrsList::excludeAttrs(Attrs, Attrs->getParamIndex(i),
ParamAttr::Nest);
// There can be only one.
break;
}
}
if (!Attrs)
return NULL;
for (unsigned i = 0, e = Attrs->size(); i != e; ++i) {
if ((Attrs->getParamAttrsAtIndex(i) & ParamAttr::Nest) == 0)
continue;
Attrs = ParamAttrsList::excludeAttrs(Attrs, Attrs->getParamIndex(i),
ParamAttr::Nest);
// There can be only one.
break;
}
return Attrs;
@ -1611,13 +1610,8 @@ static const ParamAttrsList *StripNest(const ParamAttrsList *Attrs) {
static void RemoveNestAttribute(Function *F) {
F->setParamAttrs(StripNest(F->getParamAttrs()));
for (Value::use_iterator UI = F->use_begin(), E = F->use_end(); UI != E;++UI){
Instruction *User = cast<Instruction>(*UI);
if (CallInst *CI = dyn_cast<CallInst>(User)) {
CI->setParamAttrs(StripNest(CI->getParamAttrs()));
} else {
InvokeInst *II = cast<InvokeInst>(User);
II->setParamAttrs(StripNest(II->getParamAttrs()));
}
CallSite User(cast<Instruction>(*UI));
User.setParamAttrs(StripNest(User.getParamAttrs()));
}
}

4
lib/VMCore/Instructions.cpp
View File

@ -27,6 +27,10 @@ using namespace llvm;
// CallSite Class
//===----------------------------------------------------------------------===//
CallSite::CallSite(Instruction *C) {
assert((isa<CallInst>(C) || isa<InvokeInst>(C)) && "Not a call!");
I = C;
}
unsigned CallSite::getCallingConv() const {
if (CallInst *CI = dyn_cast<CallInst>(I))
return CI->getCallingConv();