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 | 6c923bb8d9bb0cb7067cb8c7b001ccd19bcfd8ac (patch) | |
| tree | b8b9205a5878072365529a009c886d6333783455 /llvm/lib/AsmParser/LLToken.h | |
| parent | 833b9d335380864b62820bcc8c260ba278225dcd (diff) | |
| download | bcm5719-llvm-6c923bb8d9bb0cb7067cb8c7b001ccd19bcfd8ac.tar.gz bcm5719-llvm-6c923bb8d9bb0cb7067cb8c7b001ccd19bcfd8ac.zip | |
Merge the contents from exception-handling-rewrite to the mainline.
This adds the new instructions 'landingpad' and 'resume'.
llvm-svn: 136253
Diffstat (limited to 'llvm/lib/AsmParser/LLToken.h')
| -rw-r--r-- | llvm/lib/AsmParser/LLToken.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/llvm/lib/AsmParser/LLToken.h b/llvm/lib/AsmParser/LLToken.h index bf41c68ffee..f4c834ac235 100644 --- a/llvm/lib/AsmParser/LLToken.h +++ b/llvm/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 |
