aboutsummaryrefslogtreecommitdiffstats
path: root/lib/AsmParser
diff options
context:
space:
mode:
authorNick Lewycky <nicholas@mxc.ca>2008-03-10 02:20:00 +0000
committerNick Lewycky <nicholas@mxc.ca>2008-03-10 02:20:00 +0000
commit3bfbfd81e938182bd7f7fc6cace0c23c2da6a96d (patch)
tree902740a9c96315d137bfa799b78a7dc6586aad3e /lib/AsmParser
parent322e3b73f704add3cd636a47381bacf1c6b2aa00 (diff)
downloadexternal_llvm-3bfbfd81e938182bd7f7fc6cace0c23c2da6a96d.zip
external_llvm-3bfbfd81e938182bd7f7fc6cace0c23c2da6a96d.tar.gz
external_llvm-3bfbfd81e938182bd7f7fc6cace0c23c2da6a96d.tar.bz2
Turn unwind_to into "unwinds to".
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48123 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AsmParser')
-rw-r--r--lib/AsmParser/LLLexer.cpp2
-rw-r--r--lib/AsmParser/llvmAsmParser.y10
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/AsmParser/LLLexer.cpp b/lib/AsmParser/LLLexer.cpp
index 18b774b..106bb47 100644
--- a/lib/AsmParser/LLLexer.cpp
+++ b/lib/AsmParser/LLLexer.cpp
@@ -474,7 +474,7 @@ int LLLexer::LexIdentifier() {
KEYWORD("asm", ASM_TOK);
KEYWORD("sideeffect", SIDEEFFECT);
KEYWORD("gc", GC);
- KEYWORD("unwind_to", UNWIND_TO);
+ KEYWORD("unwinds", UNWINDS);
KEYWORD("cc", CC_TOK);
KEYWORD("ccc", CCC_TOK);
diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y
index c564069..76ad346 100644
--- a/lib/AsmParser/llvmAsmParser.y
+++ b/lib/AsmParser/llvmAsmParser.y
@@ -1064,7 +1064,7 @@ Module *llvm::RunVMAsmParser(llvm::MemoryBuffer *MB) {
%token OPAQUE EXTERNAL TARGET TRIPLE ALIGN ADDRSPACE
%token DEPLIBS CALL TAIL ASM_TOK MODULE SIDEEFFECT
%token CC_TOK CCC_TOK FASTCC_TOK COLDCC_TOK X86_STDCALLCC_TOK X86_FASTCALLCC_TOK
-%token DATALAYOUT UNWIND_TO
+%token DATALAYOUT UNWINDS
%type <UIntVal> OptCallingConv
%type <ParamAttrs> OptParamAttrs ParamAttr
%type <ParamAttrs> OptFuncAttrs FuncAttr
@@ -2569,8 +2569,8 @@ InstructionList : InstructionList Inst {
$$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum), 0);
CHECK_FOR_ERROR
}
- | UNWIND_TO ValueRef { // Only the unwind to block
- $$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum), getBBVal($2));
+ | UNWINDS TO ValueRef { // Only the unwind to block
+ $$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum), getBBVal($3));
CHECK_FOR_ERROR
}
| LABELSTR { // Labelled (named) basic block
@@ -2578,8 +2578,8 @@ InstructionList : InstructionList Inst {
delete $1;
CHECK_FOR_ERROR
}
- | LABELSTR UNWIND_TO ValueRef {
- $$ = defineBBVal(ValID::createLocalName(*$1), getBBVal($3));
+ | LABELSTR UNWINDS TO ValueRef {
+ $$ = defineBBVal(ValID::createLocalName(*$1), getBBVal($4));
delete $1;
CHECK_FOR_ERROR
};