Revert r129235 pending a vetting of the EH rewrite.

--- Reverse-merging r129235 into '.':
D    test/Feature/bb_attrs.ll
U    include/llvm/BasicBlock.h
U    include/llvm/Bitcode/LLVMBitCodes.h
U    lib/VMCore/AsmWriter.cpp
U    lib/VMCore/BasicBlock.cpp
U    lib/AsmParser/LLParser.cpp
U    lib/AsmParser/LLLexer.cpp
U    lib/AsmParser/LLToken.h
U    lib/Bitcode/Reader/BitcodeReader.cpp
U    lib/Bitcode/Writer/BitcodeWriter.cpp



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@129259 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling
2011-04-10 23:18:04 +00:00
parent c6cf197315
commit 5d7a5a4f53
10 changed files with 16 additions and 87 deletions

View File

@@ -714,8 +714,7 @@ bool BitcodeReader::ParseValueSymbolTable() {
// Read a record.
Record.clear();
unsigned VSTCode = Stream.ReadRecord(Code, Record);
switch (VSTCode) {
switch (Stream.ReadRecord(Code, Record)) {
default: // Default behavior: unknown type.
break;
case bitc::VST_CODE_ENTRY: { // VST_ENTRY: [valueid, namechar x N]
@@ -730,17 +729,13 @@ bool BitcodeReader::ParseValueSymbolTable() {
ValueName.clear();
break;
}
case bitc::VST_CODE_BBENTRY:
case bitc::VST_CODE_LPADENTRY: {
case bitc::VST_CODE_BBENTRY: {
if (ConvertToString(Record, 1, ValueName))
return Error("Invalid VST_BBENTRY record");
BasicBlock *BB = getBasicBlock(Record[0]);
if (BB == 0)
return Error("Invalid BB ID in VST_BBENTRY record");
if (VSTCode == bitc::VST_CODE_LPADENTRY)
BB->setIsLandingPad(true);
BB->setName(StringRef(ValueName.data(), ValueName.size()));
ValueName.clear();
break;