diff options
| author | Chris Lattner <sabre@nondot.org> | 2009-10-31 20:08:37 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2009-10-31 20:08:37 +0000 |
| commit | b2c0e243c54574485a146a0eb96bb38883a6dc27 (patch) | |
| tree | 56d41454d4e0adc0e2b304b60200b8e1fb33f1d4 /llvm/lib/Bitcode/Writer/BitcodeWriter.cpp | |
| parent | 75ce573815262082666cc90bd87575557d588c01 (diff) | |
| download | llvm-b2c0e243c54574485a146a0eb96bb38883a6dc27.zip llvm-b2c0e243c54574485a146a0eb96bb38883a6dc27.tar.gz llvm-b2c0e243c54574485a146a0eb96bb38883a6dc27.tar.bz2 | |
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).
llvm-svn: 85678
Diffstat (limited to 'llvm/lib/Bitcode/Writer/BitcodeWriter.cpp')
| -rw-r--r-- | llvm/lib/Bitcode/Writer/BitcodeWriter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp index af0b8ac..e32977d 100644 --- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -854,7 +854,8 @@ static void WriteConstants(unsigned FirstVal, unsigned LastVal, break; } } else if (const BlockAddress *BA = dyn_cast<BlockAddress>(C)) { - assert(BA->getFunction() == BA->getBasicBlock()->getParent() && + assert((!BA->getBasicBlock() || + BA->getFunction() == BA->getBasicBlock()->getParent()) && "Malformed blockaddress"); Code = bitc::CST_CODE_BLOCKADDRESS; Record.push_back(VE.getTypeID(BA->getFunction()->getType())); |