diff options
| author | Bill Wendling <isanbard@gmail.com> | 2011-07-27 20:18:04 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2011-07-27 20:18:04 +0000 |
| commit | 772fe17a6d07304ae2e6b3052bbb24ebb751f0f3 (patch) | |
| tree | 650bbc3bc584177420dee94b9fdb338ca8109bb9 /include/llvm/Bitcode/LLVMBitCodes.h | |
| parent | 7e1547ebf726a40e7ed3dbe89a77e1b946a8e2d0 (diff) | |
| download | external_llvm-772fe17a6d07304ae2e6b3052bbb24ebb751f0f3.zip external_llvm-772fe17a6d07304ae2e6b3052bbb24ebb751f0f3.tar.gz external_llvm-772fe17a6d07304ae2e6b3052bbb24ebb751f0f3.tar.bz2 | |
Merge the contents from exception-handling-rewrite to the mainline.
This adds the new instructions 'landingpad' and 'resume'.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@136253 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/Bitcode/LLVMBitCodes.h')
| -rw-r--r-- | include/llvm/Bitcode/LLVMBitCodes.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/llvm/Bitcode/LLVMBitCodes.h b/include/llvm/Bitcode/LLVMBitCodes.h index 503a867..0f74f63 100644 --- a/include/llvm/Bitcode/LLVMBitCodes.h +++ b/include/llvm/Bitcode/LLVMBitCodes.h @@ -257,7 +257,7 @@ namespace bitc { FUNC_CODE_INST_UNREACHABLE = 15, // UNREACHABLE FUNC_CODE_INST_PHI = 16, // PHI: [ty, val0,bb0, ...] - // 17 is unused. + FUNC_CODE_INST_RESUME = 17, // RESUME: [opval] // 18 is unused. FUNC_CODE_INST_ALLOCA = 19, // ALLOCA: [instty, op, align] FUNC_CODE_INST_LOAD = 20, // LOAD: [opty, op, align, vol] @@ -284,7 +284,8 @@ namespace bitc { FUNC_CODE_INST_CALL = 34, // CALL: [attr, fnty, fnid, args...] FUNC_CODE_DEBUG_LOC = 35, // DEBUG_LOC: [Line,Col,ScopeVal, IAVal] - FUNC_CODE_INST_FENCE = 36 // FENCE: [ordering, synchscope] + FUNC_CODE_INST_FENCE = 36, // FENCE: [ordering, synchscope] + FUNC_CODE_INST_LANDINGPAD = 37 // LANDINGPAD: [ty,val,val,num,id0,val0...] }; } // End bitc namespace } // End llvm namespace |