Rename isNoReturn to doesNotReturn, and isNoUnwind to

doesNotThrow.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@45160 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Function.h b/include/llvm/Function.h
index 2abde45..2c76c99 100644 (file)
--- a/include/llvm/Function.h
+++ b/include/llvm/Function.h
@@ -166,12 +166,12 @@ public:
   }
 
   /// @brief Determine if the function cannot return.
-  bool isNoReturn() const {
+  bool doesNotReturn() const {
     return paramHasAttr(0, ParamAttr::NoReturn);
   }
 
   /// @brief Determine if the function cannot unwind.
-  bool isNoUnwind() const {
+  bool doesNotThrow() const {
     return paramHasAttr(0, ParamAttr::NoUnwind);
   }
 

diff --git a/include/llvm/Instructions.h b/include/llvm/Instructions.h
index 3c8673e..cdce9ec 100644 (file)
--- a/include/llvm/Instructions.h
+++ b/include/llvm/Instructions.h
@@ -940,12 +940,12 @@ public:
   }
 
   /// @brief Determine if the call cannot return.
-  bool isNoReturn() const {
+  bool doesNotReturn() const {
     return paramHasAttr(0, ParamAttr::NoReturn);
   }
 
   /// @brief Determine if the call cannot unwind.
-  bool isNoUnwind() const {
+  bool doesNotThrow() const {
     return paramHasAttr(0, ParamAttr::NoUnwind);
   }
 
@@ -1744,12 +1744,12 @@ public:
   }
 
   /// @brief Determine if the call cannot return.
-  bool isNoReturn() const {
+  bool doesNotReturn() const {
     return paramHasAttr(0, ParamAttr::NoReturn);
   }
 
   /// @brief Determine if the call cannot unwind.
-  bool isNoUnwind() const {
+  bool doesNotThrow() const {
     return paramHasAttr(0, ParamAttr::NoUnwind);
   }
 

diff --git a/include/llvm/Support/CallSite.h b/include/llvm/Support/CallSite.h
index 3735842..ce8e9ff 100644 (file)
--- a/include/llvm/Support/CallSite.h
+++ b/include/llvm/Support/CallSite.h
@@ -74,7 +74,7 @@ public:
   bool onlyReadsMemory() const;
 
   /// @brief Determine if the call cannot unwind.
-  bool isNoUnwind() const;
+  bool doesNotThrow() const;
 
   /// getType - Return the type of the instruction that generated this call site
   ///

diff --git a/lib/Transforms/IPO/PruneEH.cpp b/lib/Transforms/IPO/PruneEH.cpp
index b4bcd99..69bb1f6 100644 (file)
--- a/lib/Transforms/IPO/PruneEH.cpp
+++ b/lib/Transforms/IPO/PruneEH.cpp
@@ -74,11 +74,11 @@ bool PruneEH::runOnSCC(const std::vector<CallGraphNode *> &SCC) {
       SCCMightUnwind = true;
       SCCMightReturn = true;
     } else if (F->isDeclaration()) {
-      SCCMightUnwind |= !F->isNoUnwind();
-      SCCMightReturn |= !F->isNoReturn();
+      SCCMightUnwind |= !F->doesNotThrow();
+      SCCMightReturn |= !F->doesNotReturn();
     } else {
-      bool CheckUnwind = !SCCMightUnwind && !F->isNoUnwind();
-      bool CheckReturn = !SCCMightReturn && !F->isNoReturn();
+      bool CheckUnwind = !SCCMightUnwind && !F->doesNotThrow();
+      bool CheckReturn = !SCCMightReturn && !F->doesNotReturn();
 
       if (!CheckUnwind && !CheckReturn)
         continue;
@@ -98,7 +98,7 @@ bool PruneEH::runOnSCC(const std::vector<CallGraphNode *> &SCC) {
         if (CheckUnwind && !SCCMightUnwind)
           for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I)
             if (CallInst *CI = dyn_cast<CallInst>(I)) {
-              if (CI->isNoUnwind()) {
+              if (CI->doesNotThrow()) {
                 // This call cannot throw.
               } else if (Function *Callee = CI->getCalledFunction()) {
                 CallGraphNode *CalleeNode = CG[Callee];
@@ -155,7 +155,7 @@ bool PruneEH::SimplifyFunction(Function *F) {
   bool MadeChange = false;
   for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) {
     if (InvokeInst *II = dyn_cast<InvokeInst>(BB->getTerminator()))
-      if (II->isNoUnwind()) {
+      if (II->doesNotThrow()) {
         SmallVector<Value*, 8> Args(II->op_begin()+3, II->op_end());
         // Insert a call instruction before the invoke.
         CallInst *Call = new CallInst(II->getCalledValue(),
@@ -187,7 +187,7 @@ bool PruneEH::SimplifyFunction(Function *F) {
 
     for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; )
       if (CallInst *CI = dyn_cast<CallInst>(I++))
-        if (CI->isNoReturn() && !isa<UnreachableInst>(I)) {
+        if (CI->doesNotReturn() && !isa<UnreachableInst>(I)) {
           // This call calls a function that cannot return.  Insert an
           // unreachable instruction after it and simplify the code.  Do this
           // by splitting the BB, adding the unreachable, then deleting the

diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp
index acda89b..d64afbb 100644 (file)
--- a/lib/Transforms/Scalar/InstructionCombining.cpp
+++ b/lib/Transforms/Scalar/InstructionCombining.cpp
@@ -8039,7 +8039,7 @@ Instruction *InstCombiner::visitCallSite(CallSite CS) {
       }
   }
 
-  if (isa<InlineAsm>(Callee) && !CS.isNoUnwind()) {
+  if (isa<InlineAsm>(Callee) && !CS.paramHasAttr(0, ParamAttr::NoUnwind)) {
     // Inline asm calls cannot throw - mark them 'nounwind'.
     const ParamAttrsList *PAL = CS.getParamAttrs();
     uint16_t RAttributes = PAL ? PAL->getParamAttrs(0) : 0;

diff --git a/lib/Transforms/Scalar/SimplifyCFG.cpp b/lib/Transforms/Scalar/SimplifyCFG.cpp
index 1d34d31..6d24404 100644 (file)
--- a/lib/Transforms/Scalar/SimplifyCFG.cpp
+++ b/lib/Transforms/Scalar/SimplifyCFG.cpp
@@ -111,7 +111,7 @@ static bool MarkAliveBlocks(BasicBlock *BB,
     // canonicalizes unreachable insts into stores to null or undef.
     for (BasicBlock::iterator BBI = BB->begin(), E = BB->end(); BBI != E;++BBI){
       if (CallInst *CI = dyn_cast<CallInst>(BBI)) {
-        if (CI->isNoReturn()) {
+        if (CI->doesNotReturn()) {
           // If we found a call to a no-return function, insert an unreachable
           // instruction after it.  Make sure there isn't *already* one there
           // though.
@@ -135,7 +135,7 @@ static bool MarkAliveBlocks(BasicBlock *BB,
 
     // Turn invokes that call 'nounwind' functions into ordinary calls.
     if (InvokeInst *II = dyn_cast<InvokeInst>(BB->getTerminator()))
-      if (II->isNoUnwind()) {
+      if (II->doesNotThrow()) {
         ChangeToCall(II);
         Changed = true;
       }

diff --git a/lib/Transforms/Utils/InlineFunction.cpp b/lib/Transforms/Utils/InlineFunction.cpp
index 69d0e12..a2b834b 100644 (file)
--- a/lib/Transforms/Utils/InlineFunction.cpp
+++ b/lib/Transforms/Utils/InlineFunction.cpp
@@ -70,7 +70,7 @@ static void HandleInlinedInvoke(InvokeInst *II, BasicBlock *FirstNewBlock,
           CallInst *CI = cast<CallInst>(I);
 
           // If this call cannot unwind, don't convert it to an invoke.
-          if (CI->isNoUnwind())
+          if (CI->doesNotThrow())
             continue;
 
           // Convert this function call into an invoke instruction.

diff --git a/lib/VMCore/Instructions.cpp b/lib/VMCore/Instructions.cpp
index 6c8a072..3531bad 100644 (file)
--- a/lib/VMCore/Instructions.cpp
+++ b/lib/VMCore/Instructions.cpp
@@ -65,11 +65,11 @@ bool CallSite::onlyReadsMemory() const {
   else
     return cast<InvokeInst>(I)->onlyReadsMemory();
 }
-bool CallSite::isNoUnwind() const {
+bool CallSite::doesNotThrow() const {
   if (CallInst *CI = dyn_cast<CallInst>(I))
-    return CI->isNoUnwind();
+    return CI->doesNotThrow();
   else
-    return cast<InvokeInst>(I)->isNoUnwind();
+    return cast<InvokeInst>(I)->doesNotThrow();
 }
 
 //===----------------------------------------------------------------------===//