mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-21 18:29:46 +00:00
adjust a couple xforms to work with null bb's in BlockAddress.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@85680 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
7d83ebcadd
commit
c1dc35094e
@ -2345,8 +2345,7 @@ static bool EvaluateFunction(Function *F, Constant *&RetVal,
|
||||
Value *Val = getVal(Values, IBI->getAddress())->stripPointerCasts();
|
||||
if (BlockAddress *BA = dyn_cast<BlockAddress>(Val))
|
||||
NewBB = BA->getBasicBlock();
|
||||
else
|
||||
return false; // Cannot determine.
|
||||
if (NewBB == 0) return false; // Cannot determine.
|
||||
} else if (ReturnInst *RI = dyn_cast<ReturnInst>(CurInst)) {
|
||||
if (RI->getNumOperands())
|
||||
RetVal = getVal(Values, RI->getOperand(0));
|
||||
|
@ -113,8 +113,13 @@ Value *llvm::MapValue(const Value *V, ValueMapTy &VM) {
|
||||
|
||||
if (BlockAddress *BA = dyn_cast<BlockAddress>(C)) {
|
||||
Function *F = cast<Function>(MapValue(BA->getFunction(), VM));
|
||||
BasicBlock *BB = cast_or_null<BasicBlock>(MapValue(BA->getBasicBlock(),VM));
|
||||
return VM[V] = BlockAddress::get(F, BB ? BB : BA->getBasicBlock());
|
||||
BasicBlock *BB = 0;
|
||||
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!");
|
||||
|
Loading…
Reference in New Issue
Block a user