diff options
| -rw-r--r-- | lib/AsmParser/Lexer.l | 2 | ||||
| -rw-r--r-- | lib/AsmParser/llvmAsmParser.y | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/AsmParser/Lexer.l b/lib/AsmParser/Lexer.l index b0e174af50..999a576299 100644 --- a/lib/AsmParser/Lexer.l +++ b/lib/AsmParser/Lexer.l @@ -191,7 +191,7 @@ zeroinitializer { return ZEROINITIALIZER; } \.\.\. { return DOTDOTDOT; } null { return NULL_TOK; } to { return TO; } -except { return EXCEPT; } +except { RET_TOK(TermOpVal, Unwind, UNWIND); } not { return NOT; } /* Deprecated, turned into XOR */ target { return TARGET; } endian { return ENDIAN; } diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y index a63c19abd3..523f95cd44 100644 --- a/lib/AsmParser/llvmAsmParser.y +++ b/lib/AsmParser/llvmAsmParser.y @@ -816,7 +816,7 @@ using namespace llvm; %token IMPLEMENTATION ZEROINITIALIZER TRUE FALSE BEGINTOK ENDTOK %token DECLARE GLOBAL CONSTANT VOLATILE -%token TO EXCEPT DOTDOTDOT NULL_TOK CONST INTERNAL LINKONCE WEAK APPENDING +%token TO DOTDOTDOT NULL_TOK CONST INTERNAL LINKONCE WEAK APPENDING %token OPAQUE NOT EXTERNAL TARGET ENDIAN POINTERSIZE LITTLE BIG // Basic Block Terminating Operators @@ -1611,7 +1611,7 @@ BBTerminatorInst : RET ResolvedVal { // Return with a result... $$ = S; } | INVOKE TypesV ValueRef '(' ValueRefListE ')' TO ResolvedVal - EXCEPT ResolvedVal { + UNWIND ResolvedVal { const PointerType *PFTy; const FunctionType *Ty; |