Make blockaddress(@func, null) be valid, and make 'deleting a basic

block with a blockaddress still referring to it' replace the invalid 
blockaddress with a new blockaddress(@func, null) instead of a 
inttoptr(1).

This changes the bitcode encoding format, and still needs codegen 
support (this should produce a non-zero value, referring to the entry
block of the function would also be quite reasonable).


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@85678 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2009-10-31 20:08:37 +00:00
parent e3246fc6ab
commit 7d83ebcadd
9 changed files with 39 additions and 21 deletions

View File

@ -2274,11 +2274,12 @@ bool BitcodeReader::ParseFunctionBody(Function *F) {
std::vector<BlockAddrRefTy> &RefList = BAFRI->second;
for (unsigned i = 0, e = RefList.size(); i != e; ++i) {
unsigned BlockIdx = RefList[i].first;
if (BlockIdx >= FunctionBBs.size())
if (BlockIdx > FunctionBBs.size())
return Error("Invalid blockaddress block #");
GlobalVariable *FwdRef = RefList[i].second;
FwdRef->replaceAllUsesWith(BlockAddress::get(F, FunctionBBs[BlockIdx]));
BasicBlock *BB = BlockIdx == 0 ? 0 : FunctionBBs[BlockIdx-1];
FwdRef->replaceAllUsesWith(BlockAddress::get(F, BB));
FwdRef->eraseFromParent();
}