6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-21 18:29:46 +00:00
Code Issues Projects Releases Wiki Activity

adjust a couple xforms to work with null bb's in BlockAddress.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@85680 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2009-10-31 20:13:24 +00:00
parent 7d83ebcadd
commit c1dc35094e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2345,8 +2345,7 @@ static bool EvaluateFunction(Function *F, Constant *&RetVal,
Value *Val = getVal(Values, IBI->getAddress())->stripPointerCasts(); Value *Val = getVal(Values, IBI->getAddress())->stripPointerCasts();
if (BlockAddress *BA = dyn_cast<BlockAddress>(Val)) if (BlockAddress *BA = dyn_cast<BlockAddress>(Val))
NewBB = BA->getBasicBlock(); NewBB = BA->getBasicBlock();
else if (NewBB == 0) return false; // Cannot determine.
return false; // Cannot determine.
} else if (ReturnInst *RI = dyn_cast<ReturnInst>(CurInst)) { } else if (ReturnInst *RI = dyn_cast<ReturnInst>(CurInst)) {
if (RI->getNumOperands()) if (RI->getNumOperands())
RetVal = getVal(Values, RI->getOperand(0)); RetVal = getVal(Values, RI->getOperand(0));

9
lib/Transforms/Utils/ValueMapper.cpp
View File

@ -113,8 +113,13 @@ Value *llvm::MapValue(const Value *V, ValueMapTy &VM) {
if (BlockAddress *BA = dyn_cast<BlockAddress>(C)) { if (BlockAddress *BA = dyn_cast<BlockAddress>(C)) {
Function *F = cast<Function>(MapValue(BA->getFunction(), VM)); Function *F = cast<Function>(MapValue(BA->getFunction(), VM));
BasicBlock *BB = cast_or_null<BasicBlock>(MapValue(BA->getBasicBlock(),VM)); BasicBlock *BB = 0;
return VM[V] = BlockAddress::get(F, BB ? BB : BA->getBasicBlock()); if (BA->getBasicBlock()) {
BB = cast_or_null<BasicBlock>(MapValue(BA->getBasicBlock(),VM));
BB = BB ? BB : BA->getBasicBlock();
}
return VM[V] = BlockAddress::get(F, BB);
} }
llvm_unreachable("Unknown type of constant!"); llvm_unreachable("Unknown type of constant!");