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 /lib/AsmParser/LLToken.h | |
| parent | 7e1547ebf726a40e7ed3dbe89a77e1b946a8e2d0 (diff) | |
| download | llvm-772fe17a6d07304ae2e6b3052bbb24ebb751f0f3.tar.gz llvm-772fe17a6d07304ae2e6b3052bbb24ebb751f0f3.tar.bz2 llvm-772fe17a6d07304ae2e6b3052bbb24ebb751f0f3.tar.xz | |
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 'lib/AsmParser/LLToken.h')
| -rw-r--r-- | lib/AsmParser/LLToken.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/AsmParser/LLToken.h b/lib/AsmParser/LLToken.h index bf41c68ffe..f4c834ac23 100644 --- a/lib/AsmParser/LLToken.h +++ b/lib/AsmParser/LLToken.h @@ -121,7 +121,9 @@ namespace lltok { kw_fptoui, kw_fptosi, kw_inttoptr, kw_ptrtoint, kw_bitcast, kw_select, kw_va_arg, - kw_ret, kw_br, kw_switch, kw_indirectbr, kw_invoke, kw_unwind, + kw_landingpad, kw_personality, kw_cleanup, kw_catch, kw_filter, + + kw_ret, kw_br, kw_switch, kw_indirectbr, kw_invoke, kw_unwind, kw_resume, kw_unreachable, kw_alloca, kw_load, kw_store, kw_fence, kw_getelementptr, @@ -143,8 +145,8 @@ namespace lltok { // Type valued tokens (TyVal). Type, - APFloat, // APFloatVal - APSInt // APSInt + APFloat, // APFloatVal + APSInt // APSInt }; } // end namespace lltok } // end namespace llvm |