From 9be3c97183f832d084bcf0fab82f7cd8aae08385 Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Mon, 10 Mar 2008 02:20:00 +0000 Subject: Turn unwind_to into "unwinds to". git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48123 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/AsmParser/LLLexer.cpp | 2 +- lib/AsmParser/llvmAsmParser.y | 10 +++++----- lib/Transforms/IPO/PruneEH.cpp | 2 +- lib/Transforms/Utils/CloneFunction.cpp | 2 +- lib/Transforms/Utils/CloneTrace.cpp | 2 +- lib/Transforms/Utils/SimplifyCFG.cpp | 2 +- lib/VMCore/AsmWriter.cpp | 2 +- test/Feature/unwindto.ll | 18 +++++++++--------- test/Transforms/Inline/unwindto.ll | 2 +- test/Transforms/PruneEH/unwindto.ll | 8 ++++---- test/Transforms/SimplifyCFG/unwindto.ll | 20 ++++++++++---------- 11 files changed, 35 insertions(+), 35 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 OptCallingConv %type OptParamAttrs ParamAttr %type 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(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(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 &origTrace) { for (std::vector::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(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); } diff --git a/test/Feature/unwindto.ll b/test/Feature/unwindto.ll index bfdf203959..ad1bb1ab9b 100644 --- a/test/Feature/unwindto.ll +++ b/test/Feature/unwindto.ll @@ -4,7 +4,7 @@ ; http://nondot.org/sabre/LLVMNotes/ExceptionHandlingChanges.txt define i1 @test1(i8 %i, i8 %j) { -entry: unwind_to %target +entry: unwinds to %target %tmp = sub i8 %i, %j ; [#uses=1] %b = icmp eq i8 %tmp, 0 ; [#uses=1] ret i1 %b @@ -15,7 +15,7 @@ target: define i1 @test2(i8 %i, i8 %j) { entry: br label %0 -unwind_to %1 +unwinds to %1 %tmp = sub i8 %i, %j ; [#uses=1] %b = icmp eq i8 %tmp, 0 ; [#uses=1] ret i1 %b @@ -26,11 +26,11 @@ unwind_to %1 define i1 @test3(i8 %i, i8 %j) { entry: br label %0 -unwind_to %1 +unwinds to %1 %tmp = sub i8 %i, %j ; [#uses=1] %b = icmp eq i8 %tmp, 0 ; [#uses=1] ret i1 %b -unwind_to %0 +unwinds to %0 ret i1 false } @@ -38,7 +38,7 @@ define i1 @test4(i8 %i, i8 %j) { %tmp = sub i8 %i, %j ; [#uses=1] %b = icmp eq i8 %tmp, 0 ; [#uses=1] br label %1 -unwind_to %1 +unwinds to %1 ret i1 false } @@ -49,16 +49,16 @@ define void @test5() { define void @test6() { entry: br label %unwind -unwind: unwind_to %unwind +unwind: unwinds to %unwind unwind } define i8 @test7(i1 %b) { -entry: unwind_to %cleanup +entry: unwinds to %cleanup br i1 %b, label %cond_true, label %cond_false -cond_true: unwind_to %cleanup +cond_true: unwinds to %cleanup br label %cleanup -cond_false: unwind_to %cleanup +cond_false: unwinds to %cleanup br label %cleanup cleanup: %x = phi i8 [0, %entry], [1, %cond_true], [1, %cond_true], diff --git a/test/Transforms/Inline/unwindto.ll b/test/Transforms/Inline/unwindto.ll index 28e857d2f9..1213497b5b 100644 --- a/test/Transforms/Inline/unwindto.ll +++ b/test/Transforms/Inline/unwindto.ll @@ -5,7 +5,7 @@ define void @g() { } define i32 @f1() { -entry: unwind_to %cleanup +entry: unwinds to %cleanup call void @g() ret i32 0 cleanup: diff --git a/test/Transforms/PruneEH/unwindto.ll b/test/Transforms/PruneEH/unwindto.ll index 8e5ac25ec8..ed69f4ce22 100644 --- a/test/Transforms/PruneEH/unwindto.ll +++ b/test/Transforms/PruneEH/unwindto.ll @@ -1,11 +1,11 @@ -; RUN: llvm-as < %s | opt -prune-eh | llvm-dis | not grep unwind_to +; RUN: llvm-as < %s | opt -prune-eh | llvm-dis | not grep {unwinds to} define i8 @test7(i1 %b) { -entry: unwind_to %cleanup +entry: unwinds to %cleanup br i1 %b, label %cond_true, label %cond_false -cond_true: unwind_to %cleanup +cond_true: unwinds to %cleanup br label %cleanup -cond_false: unwind_to %cleanup +cond_false: unwinds to %cleanup br label %cleanup cleanup: %x = phi i8 [0, %entry], [1, %cond_true], [1, %cond_true], diff --git a/test/Transforms/SimplifyCFG/unwindto.ll b/test/Transforms/SimplifyCFG/unwindto.ll index 4e91c83015..a65e29887c 100644 --- a/test/Transforms/SimplifyCFG/unwindto.ll +++ b/test/Transforms/SimplifyCFG/unwindto.ll @@ -1,14 +1,14 @@ -; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep unwind_to | count 3 +; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | grep {unwinds to} | count 3 declare void @g(i32) define i32 @f1() { entry: br label %bb1 -bb1: unwind_to %cleanup1 +bb1: unwinds to %cleanup1 call void @g(i32 0) br label %bb2 -bb2: unwind_to %cleanup2 +bb2: unwinds to %cleanup2 call void @g(i32 1) br label %exit exit: @@ -20,22 +20,22 @@ cleanup2: } define i32 @f2() { -entry: unwind_to %cleanup +entry: unwinds to %cleanup br label %bb1 -bb1: unwind_to %cleanup +bb1: unwinds to %cleanup br label %bb2 -bb2: unwind_to %cleanup +bb2: unwinds to %cleanup br label %bb3 bb3: br label %bb4 -bb4: unwind_to %cleanup +bb4: unwinds to %cleanup ret i32 0 cleanup: ret i32 1 } define i32 @f3() { -entry: unwind_to %cleanup +entry: unwinds to %cleanup call void @g(i32 0) ret i32 0 cleanup: @@ -43,7 +43,7 @@ cleanup: } define i32 @f4() { -entry: unwind_to %cleanup +entry: unwinds to %cleanup call void @g(i32 0) br label %cleanup cleanup: @@ -51,7 +51,7 @@ cleanup: } define i32 @f5() { -entry: unwind_to %cleanup +entry: unwinds to %cleanup call void @g(i32 0) br label %other other: -- cgit v1.2.3