6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-22 09:29:31 +00:00
Code Issues Projects Releases Wiki Activity

remove autoupgrade support for LLVM 2.9 exception stuff. Mainline supports

Browse Source 
LLVM 3.0 and later.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@145165 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2011-11-27 05:56:16 +00:00
parent dbc88494ee
commit 9d5f6ccd26
4 changed files with 0 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/AutoUpgrade.h
View File

@ -43,10 +43,6 @@ namespace llvm {
/// This function checks debug info intrinsics. If an intrinsic is invalid
/// then this function simply removes the intrinsic.
void CheckDebugInfoIntrinsics(Module *M);
/// This function upgrades the old pre-3.0 exception handling system to the
/// new one. N.B. This will be removed in 3.1.
void UpgradeExceptionHandling(Module *M);
} // End llvm namespace
#endif

3
lib/AsmParser/LLParser.cpp
View File

@ -120,9 +120,6 @@ bool LLParser::ValidateEndOfModule() {
for (Module::iterator FI = M->begin(), FE = M->end(); FI != FE; )
UpgradeCallsToIntrinsic(FI++); // must be post-increment, as we remove
// Upgrade to new EH scheme. N.B. This will go away in 3.1.
UpgradeExceptionHandling(M);
// Check debug info intrinsics.
CheckDebugInfoIntrinsics(M);
return false;

3
lib/Bitcode/Reader/BitcodeReader.cpp
View File

@ -2701,9 +2701,6 @@ bool BitcodeReader::MaterializeModule(Module *M, std::string *ErrInfo) {
}
std::vector<std::pair<Function*, Function*> >().swap(UpgradedIntrinsics);
// Upgrade to new EH scheme. N.B. This will go away in 3.1.
UpgradeExceptionHandling(M);
// Check debug info intrinsics.
CheckDebugInfoIntrinsics(TheModule);

246
lib/VMCore/AutoUpgrade.cpp
View File

@ -420,249 +420,3 @@ void llvm::CheckDebugInfoIntrinsics(Module *M) {
}
}
}
/// FindExnAndSelIntrinsics - Find the eh_exception and eh_selector intrinsic
/// calls reachable from the unwind basic block.
static void FindExnAndSelIntrinsics(BasicBlock *BB, CallInst *&Exn,
CallInst *&Sel,
SmallPtrSet<BasicBlock*, 8> &Visited) {
if (!Visited.insert(BB)) return;
for (BasicBlock::iterator
I = BB->begin(), E = BB->end(); I != E; ++I) {
if (CallInst *CI = dyn_cast<CallInst>(I)) {
switch (CI->getCalledFunction()->getIntrinsicID()) {
default: break;
case Intrinsic::eh_exception:
assert(!Exn && "Found more than one eh.exception call!");
Exn = CI;
break;
case Intrinsic::eh_selector:
assert(!Sel && "Found more than one eh.selector call!");
Sel = CI;
break;
}
if (Exn && Sel) return;
}
}
if (Exn && Sel) return;
for (succ_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I) {
FindExnAndSelIntrinsics(*I, Exn, Sel, Visited);
if (Exn && Sel) return;
}
}
/// TransferClausesToLandingPadInst - Transfer the exception handling clauses
/// from the eh_selector call to the new landingpad instruction.
static void TransferClausesToLandingPadInst(LandingPadInst *LPI,
CallInst *EHSel) {
LLVMContext &Context = LPI->getContext();
unsigned N = EHSel->getNumArgOperands();
for (unsigned i = N - 1; i > 1; --i) {
if (const ConstantInt *CI = dyn_cast<ConstantInt>(EHSel->getArgOperand(i))){
unsigned FilterLength = CI->getZExtValue();
unsigned FirstCatch = i + FilterLength + !FilterLength;
assert(FirstCatch <= N && "Invalid filter length");
if (FirstCatch < N)
for (unsigned j = FirstCatch; j < N; ++j) {
Value *Val = EHSel->getArgOperand(j);
if (!Val->hasName() || Val->getName() != "llvm.eh.catch.all.value") {
LPI->addClause(EHSel->getArgOperand(j));
} else {
GlobalVariable *GV = cast<GlobalVariable>(Val);
LPI->addClause(GV->getInitializer());
}
}
if (!FilterLength) {
// Cleanup.
LPI->setCleanup(true);
} else {
// Filter.
SmallVector<Constant *, 4> TyInfo;
TyInfo.reserve(FilterLength - 1);
for (unsigned j = i + 1; j < FirstCatch; ++j)
TyInfo.push_back(cast<Constant>(EHSel->getArgOperand(j)));
ArrayType *AType =
ArrayType::get(!TyInfo.empty() ? TyInfo[0]->getType() :
PointerType::getUnqual(Type::getInt8Ty(Context)),
TyInfo.size());
LPI->addClause(ConstantArray::get(AType, TyInfo));
}
N = i;
}
}
if (N > 2)
for (unsigned j = 2; j < N; ++j) {
Value *Val = EHSel->getArgOperand(j);
if (!Val->hasName() || Val->getName() != "llvm.eh.catch.all.value") {
LPI->addClause(EHSel->getArgOperand(j));
} else {
GlobalVariable *GV = cast<GlobalVariable>(Val);
LPI->addClause(GV->getInitializer());
}
}
}
/// This function upgrades the old pre-3.0 exception handling system to the new
/// one. N.B. This will be removed in 3.1.
void llvm::UpgradeExceptionHandling(Module *M) {
Function *EHException = M->getFunction("llvm.eh.exception");
Function *EHSelector = M->getFunction("llvm.eh.selector");
if (!EHException || !EHSelector)
return;
LLVMContext &Context = M->getContext();
Type *ExnTy = PointerType::getUnqual(Type::getInt8Ty(Context));
Type *SelTy = Type::getInt32Ty(Context);
Type *LPadSlotTy = StructType::get(ExnTy, SelTy, NULL);
// This map links the invoke instruction with the eh.exception and eh.selector
// calls associated with it.
DenseMap<InvokeInst*, std::pair<Value*, Value*> > InvokeToIntrinsicsMap;
for (Module::iterator
I = M->begin(), E = M->end(); I != E; ++I) {
Function &F = *I;
for (Function::iterator
II = F.begin(), IE = F.end(); II != IE; ++II) {
BasicBlock *BB = &*II;
InvokeInst *Inst = dyn_cast<InvokeInst>(BB->getTerminator());
if (!Inst) continue;
BasicBlock *UnwindDest = Inst->getUnwindDest();
if (UnwindDest->isLandingPad()) continue; // Already converted.
SmallPtrSet<BasicBlock*, 8> Visited;
CallInst *Exn = 0;
CallInst *Sel = 0;
FindExnAndSelIntrinsics(UnwindDest, Exn, Sel, Visited);
assert(Exn && Sel && "Cannot find eh.exception and eh.selector calls!");
InvokeToIntrinsicsMap[Inst] = std::make_pair(Exn, Sel);
}
}
// This map stores the slots where the exception object and selector value are
// stored within a function.
DenseMap<Function*, std::pair<Value*, Value*> > FnToLPadSlotMap;
SmallPtrSet<Instruction*, 32> DeadInsts;
for (DenseMap<InvokeInst*, std::pair<Value*, Value*> >::iterator
I = InvokeToIntrinsicsMap.begin(), E = InvokeToIntrinsicsMap.end();
I != E; ++I) {
InvokeInst *Invoke = I->first;
BasicBlock *UnwindDest = Invoke->getUnwindDest();
Function *F = UnwindDest->getParent();
std::pair<Value*, Value*> EHIntrinsics = I->second;
CallInst *Exn = cast<CallInst>(EHIntrinsics.first);
CallInst *Sel = cast<CallInst>(EHIntrinsics.second);
// Store the exception object and selector value in the entry block.
Value *ExnSlot = 0;
Value *SelSlot = 0;
if (!FnToLPadSlotMap[F].first) {
BasicBlock *Entry = &F->front();
ExnSlot = new AllocaInst(ExnTy, "exn", Entry->getTerminator());
SelSlot = new AllocaInst(SelTy, "sel", Entry->getTerminator());
FnToLPadSlotMap[F] = std::make_pair(ExnSlot, SelSlot);
} else {
ExnSlot = FnToLPadSlotMap[F].first;
SelSlot = FnToLPadSlotMap[F].second;
}
if (!UnwindDest->getSinglePredecessor()) {
// The unwind destination doesn't have a single predecessor. Create an
// unwind destination which has only one predecessor.
BasicBlock *NewBB = BasicBlock::Create(Context, "new.lpad",
UnwindDest->getParent());
BranchInst::Create(UnwindDest, NewBB);
Invoke->setUnwindDest(NewBB);
// Fix up any PHIs in the original unwind destination block.
for (BasicBlock::iterator
II = UnwindDest->begin(); isa<PHINode>(II); ++II) {
PHINode *PN = cast<PHINode>(II);
int Idx = PN->getBasicBlockIndex(Invoke->getParent());
if (Idx == -1) continue;
PN->setIncomingBlock(Idx, NewBB);
}
UnwindDest = NewBB;
}
IRBuilder<> Builder(Context);
Builder.SetInsertPoint(UnwindDest, UnwindDest->getFirstInsertionPt());
Value *PersFn = Sel->getArgOperand(1);
LandingPadInst *LPI = Builder.CreateLandingPad(LPadSlotTy, PersFn, 0);
Value *LPExn = Builder.CreateExtractValue(LPI, 0);
Value *LPSel = Builder.CreateExtractValue(LPI, 1);
Builder.CreateStore(LPExn, ExnSlot);
Builder.CreateStore(LPSel, SelSlot);
TransferClausesToLandingPadInst(LPI, Sel);
DeadInsts.insert(Exn);
DeadInsts.insert(Sel);
}
// Replace the old intrinsic calls with the values from the landingpad
// instruction(s). These values were stored in allocas for us to use here.
for (DenseMap<InvokeInst*, std::pair<Value*, Value*> >::iterator
I = InvokeToIntrinsicsMap.begin(), E = InvokeToIntrinsicsMap.end();
I != E; ++I) {
std::pair<Value*, Value*> EHIntrinsics = I->second;
CallInst *Exn = cast<CallInst>(EHIntrinsics.first);
CallInst *Sel = cast<CallInst>(EHIntrinsics.second);
BasicBlock *Parent = Exn->getParent();
std::pair<Value*,Value*> ExnSelSlots = FnToLPadSlotMap[Parent->getParent()];
IRBuilder<> Builder(Context);
Builder.SetInsertPoint(Parent, Exn);
LoadInst *LPExn = Builder.CreateLoad(ExnSelSlots.first, "exn.load");
LoadInst *LPSel = Builder.CreateLoad(ExnSelSlots.second, "sel.load");
Exn->replaceAllUsesWith(LPExn);
Sel->replaceAllUsesWith(LPSel);
}
// Remove the dead instructions.
for (SmallPtrSet<Instruction*, 32>::iterator
I = DeadInsts.begin(), E = DeadInsts.end(); I != E; ++I) {
Instruction *Inst = *I;
Inst->eraseFromParent();
}
// Replace calls to "llvm.eh.resume" with the 'resume' instruction. Load the
// exception and selector values from the stored place.
Function *EHResume = M->getFunction("llvm.eh.resume");
if (!EHResume) return;
while (!EHResume->use_empty()) {
CallInst *Resume = cast<CallInst>(EHResume->use_back());
BasicBlock *BB = Resume->getParent();
IRBuilder<> Builder(Context);
Builder.SetInsertPoint(BB, Resume);
Value *LPadVal =
Builder.CreateInsertValue(UndefValue::get(LPadSlotTy),
Resume->getArgOperand(0), 0, "lpad.val");
LPadVal = Builder.CreateInsertValue(LPadVal, Resume->getArgOperand(1),
1, "lpad.val");
Builder.CreateResume(LPadVal);
// Remove all instructions after the 'resume.'
BasicBlock::iterator I = Resume;
while (I != BB->end()) {
Instruction *Inst = &*I++;
Inst->eraseFromParent();
}
}
}