diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/AsmParser/LLLexer.cpp | 2 | ||||
| -rw-r--r-- | lib/AsmParser/llvmAsmParser.y | 10 | ||||
| -rw-r--r-- | lib/Transforms/IPO/PruneEH.cpp | 2 | ||||
| -rw-r--r-- | lib/Transforms/Utils/CloneFunction.cpp | 2 | ||||
| -rw-r--r-- | lib/Transforms/Utils/CloneTrace.cpp | 2 | ||||
| -rw-r--r-- | lib/Transforms/Utils/SimplifyCFG.cpp | 2 | ||||
| -rw-r--r-- | lib/VMCore/AsmWriter.cpp | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/lib/AsmParser/LLLexer.cpp b/lib/AsmParser/LLLexer.cpp index 18b774b182..106bb4765a 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 c5640698de..76ad346fed 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 }; diff --git a/lib/Transforms/IPO/PruneEH.cpp b/lib/Transforms/IPO/PruneEH.cpp index ec0558e80a..147818a47e 100644 --- a/lib/Transforms/IPO/PruneEH.cpp +++ b/lib/Transforms/IPO/PruneEH.cpp @@ -32,7 +32,7 @@ using namespace llvm; STATISTIC(NumRemoved, "Number of invokes removed"); STATISTIC(NumUnreach, "Number of noreturn calls optimized"); -STATISTIC(NumBBUnwind, "Number of unwind_to removed from blocks"); +STATISTIC(NumBBUnwind, "Number of unwind dest removed from blocks"); namespace { struct VISIBILITY_HIDDEN PruneEH : public CallGraphSCCPass { diff --git a/lib/Transforms/Utils/CloneFunction.cpp b/lib/Transforms/Utils/CloneFunction.cpp index 5d0d1d8c67..976dda45bf 100644 --- a/lib/Transforms/Utils/CloneFunction.cpp +++ b/lib/Transforms/Utils/CloneFunction.cpp @@ -105,7 +105,7 @@ void llvm::CloneFunctionInto(Function *NewFunc, const Function *OldFunc, // for (Function::iterator BB = cast<BasicBlock>(ValueMap[OldFunc->begin()]), BE = NewFunc->end(); BB != BE; ++BB) { - // Fix up the unwind_to label. + // Fix up the unwind destination. if (BasicBlock *UnwindDest = BB->getUnwindDest()) BB->setUnwindDest(cast<BasicBlock>(ValueMap[UnwindDest])); diff --git a/lib/Transforms/Utils/CloneTrace.cpp b/lib/Transforms/Utils/CloneTrace.cpp index 1cedfd872c..968fb5abcc 100644 --- a/lib/Transforms/Utils/CloneTrace.cpp +++ b/lib/Transforms/Utils/CloneTrace.cpp @@ -69,7 +69,7 @@ llvm::CloneTrace(const std::vector<BasicBlock*> &origTrace) { for (std::vector<BasicBlock *>::const_iterator BB = clonedTrace.begin(), BE = clonedTrace.end(); BB != BE; ++BB) { - //Remap the unwind_to label + //Remap the unwind destination if (BasicBlock *UnwindDest = (*BB)->getUnwindDest()) (*BB)->setUnwindDest(cast<BasicBlock>(ValueMap[UnwindDest])); diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp index b9a9bc1c39..ac5c2ec770 100644 --- a/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/lib/Transforms/Utils/SimplifyCFG.cpp @@ -1829,7 +1829,7 @@ bool llvm::SimplifyCFG(BasicBlock *BB) { // Move all definitions in the successor to the predecessor. OnlyPred->getInstList().splice(OnlyPred->end(), BB->getInstList()); - // Move the unwind_to block + // Move the unwind destination block if (!OnlyPred->getUnwindDest() && BB->getUnwindDest()) OnlyPred->setUnwindDest(BB->getUnwindDest()); diff --git a/lib/VMCore/AsmWriter.cpp b/lib/VMCore/AsmWriter.cpp index 64119eddc8..438bdadcd0 100644 --- a/lib/VMCore/AsmWriter.cpp +++ b/lib/VMCore/AsmWriter.cpp @@ -1169,7 +1169,7 @@ void AssemblyWriter::printBasicBlock(const BasicBlock *BB) { if (BB->hasName()) Out << ' '; - Out << "unwind_to"; + Out << "unwinds to"; writeOperand(unwindDest, false); } |