diff options
| author | Bill Wendling <isanbard@gmail.com> | 2011-04-10 23:18:04 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2011-04-10 23:18:04 +0000 |
| commit | 5d7a5a4f53304869ae5b76771ab67213447b65a5 (patch) | |
| tree | 7a3b9ece646fc6ee260ab1467a1e693d9128b5a1 /include | |
| parent | c6cf19731504e7f922d1409ac118c59f5ab8e3c2 (diff) | |
| download | external_llvm-5d7a5a4f53304869ae5b76771ab67213447b65a5.zip external_llvm-5d7a5a4f53304869ae5b76771ab67213447b65a5.tar.gz external_llvm-5d7a5a4f53304869ae5b76771ab67213447b65a5.tar.bz2 | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/llvm/BasicBlock.h | 6 | ||||
| -rw-r--r-- | include/llvm/Bitcode/LLVMBitCodes.h | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/include/llvm/BasicBlock.h b/include/llvm/BasicBlock.h index 3336b36..7e7c9e7 100644 --- a/include/llvm/BasicBlock.h +++ b/include/llvm/BasicBlock.h @@ -74,7 +74,6 @@ public: private: InstListType InstList; Function *Parent; - bool IsLandingPad; void setParent(Function *parent); friend class SymbolTableListTraits<BasicBlock, Function>; @@ -139,11 +138,6 @@ public: return const_cast<BasicBlock*>(this)->getFirstNonPHIOrDbg(); } - /// isLandingPad - True if this basic block is a landing pad for exception - /// handling. - bool isLandingPad() const { return IsLandingPad; } - void setIsLandingPad(bool Val = true) { IsLandingPad = Val; } - /// removeFromParent - This method unlinks 'this' from the containing /// function, but does not delete it. /// diff --git a/include/llvm/Bitcode/LLVMBitCodes.h b/include/llvm/Bitcode/LLVMBitCodes.h index dcfbe5a..7692bd2 100644 --- a/include/llvm/Bitcode/LLVMBitCodes.h +++ b/include/llvm/Bitcode/LLVMBitCodes.h @@ -106,9 +106,8 @@ namespace bitc { // The value symbol table only has one code (VST_ENTRY_CODE). enum ValueSymtabCodes { - VST_CODE_ENTRY = 1, // VST_ENTRY: [valid, namechar x N] - VST_CODE_BBENTRY = 2, // VST_BBENTRY: [bbid, namechar x N] - VST_CODE_LPADENTRY = 3 // VST_LPADENTRY: [lpadid, namechar x N] + VST_CODE_ENTRY = 1, // VST_ENTRY: [valid, namechar x N] + VST_CODE_BBENTRY = 2 // VST_BBENTRY: [bbid, namechar x N] }; enum MetadataCodes { |