commit fb2c1a999ac6f68170a7a1f09c7b2bc8ed15351d
author Nick Lewycky <nicholas@mxc.ca> Mon Mar 10 02:20:00 2008 +0000
committer Nick Lewycky <nicholas@mxc.ca> Mon Mar 10 02:20:00 2008 +0000
tree e22cda1c1515db3e073a725c869600dc025a8fdd
parent 4e622ec86d8b4b8e40dcf3c8dcfd405190a31bbb

Turn unwind_to into "unwinds to".

llvm-svn: 48123

llvm/lib/AsmParser/LLLexer.cpp

diff --git a/llvm/lib/AsmParser/LLLexer.cpp b/llvm/lib/AsmParser/LLLexer.cpp
index 18b774b..106bb47 100644
--- a/llvm/lib/AsmParser/LLLexer.cpp
+++ b/llvm/lib/AsmParser/LLLexer.cpp
@@ -474,7 +474,7 @@
   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);

llvm/lib/AsmParser/llvmAsmParser.y

diff --git a/llvm/lib/AsmParser/llvmAsmParser.y b/llvm/lib/AsmParser/llvmAsmParser.y
index c564069..76ad346 100644
--- a/llvm/lib/AsmParser/llvmAsmParser.y
+++ b/llvm/lib/AsmParser/llvmAsmParser.y
@@ -1064,7 +1064,7 @@
 %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 @@
     $$ = 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 @@
     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
   };

llvm/lib/Transforms/IPO/PruneEH.cpp

diff --git a/llvm/lib/Transforms/IPO/PruneEH.cpp b/llvm/lib/Transforms/IPO/PruneEH.cpp
index ec0558e..147818a 100644
--- a/llvm/lib/Transforms/IPO/PruneEH.cpp
+++ b/llvm/lib/Transforms/IPO/PruneEH.cpp
@@ -32,7 +32,7 @@
 
 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 {

llvm/lib/Transforms/Utils/CloneFunction.cpp

diff --git a/llvm/lib/Transforms/Utils/CloneFunction.cpp b/llvm/lib/Transforms/Utils/CloneFunction.cpp
index 5d0d1d8..976dda45 100644
--- a/llvm/lib/Transforms/Utils/CloneFunction.cpp
+++ b/llvm/lib/Transforms/Utils/CloneFunction.cpp
@@ -105,7 +105,7 @@
   //
   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]));
 

llvm/lib/Transforms/Utils/CloneTrace.cpp

diff --git a/llvm/lib/Transforms/Utils/CloneTrace.cpp b/llvm/lib/Transforms/Utils/CloneTrace.cpp
index 1cedfd8..968fb5a 100644
--- a/llvm/lib/Transforms/Utils/CloneTrace.cpp
+++ b/llvm/lib/Transforms/Utils/CloneTrace.cpp
@@ -69,7 +69,7 @@
   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]));
 

llvm/lib/Transforms/Utils/SimplifyCFG.cpp

diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
index b9a9bc1..ac5c2ec 100644
--- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
+++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -1829,7 +1829,7 @@
     // 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());
 

llvm/lib/VMCore/AsmWriter.cpp

diff --git a/llvm/lib/VMCore/AsmWriter.cpp b/llvm/lib/VMCore/AsmWriter.cpp
index 64119ed..438bdad 100644
--- a/llvm/lib/VMCore/AsmWriter.cpp
+++ b/llvm/lib/VMCore/AsmWriter.cpp
@@ -1169,7 +1169,7 @@
     if (BB->hasName())
       Out << ' ';
 
-    Out << "unwind_to";
+    Out << "unwinds to";
     writeOperand(unwindDest, false);
   }