[llvm-commits] [llvm] r53223 - in /llvm/trunk: include/llvm/Instructions.h include/llvm/Support/CallSite.h lib/VMCore/Instructions.cpp

[Duncan Sands]

Author: baldrick
Date: Tue Jul  8 03:38:44 2008
New Revision: 53223

URL: http://llvm.org/viewvc/llvm-project?rev=53223&view=rev
Log:
Add some convenience methods for manipulating
call attributes.

Modified:
    llvm/trunk/include/llvm/Instructions.h
    llvm/trunk/include/llvm/Support/CallSite.h
    llvm/trunk/lib/VMCore/Instructions.cpp

Modified: llvm/trunk/include/llvm/Instructions.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Instructions.h?rev=53223&r1=53222&r2=53223&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Instructions.h (original)
+++ llvm/trunk/include/llvm/Instructions.h Tue Jul  8 03:38:44 2008
@@ -1065,6 +1065,9 @@
   /// addParamAttr - adds the attribute to the list of attributes.
   void addParamAttr(unsigned i, ParameterAttributes attr);
 
+  /// removeParamAttr - removes the attribute from the list of attributes.
+  void removeParamAttr(unsigned i, ParameterAttributes attr);
+
   /// @brief Determine whether the call or the callee has the given attribute.
   bool paramHasAttr(unsigned i, unsigned attr) const;
 
@@ -1077,22 +1080,37 @@
   bool doesNotAccessMemory() const {
     return paramHasAttr(0, ParamAttr::ReadNone);
   }
-  
+  void setDoesNotAccessMemory(bool doesNotAccessMemory = true) {
+    if (doesNotAccessMemory) addParamAttr(0, ParamAttr::ReadNone);
+    else removeParamAttr(0, ParamAttr::ReadNone);
+  }
+
   /// @brief Determine if the call does not access or only reads memory.
   bool onlyReadsMemory() const {
     return doesNotAccessMemory() || paramHasAttr(0, ParamAttr::ReadOnly);
   }
-  
+  void setOnlyReadsMemory(bool onlyReadsMemory = true) {
+    if (onlyReadsMemory) addParamAttr(0, ParamAttr::ReadOnly);
+    else removeParamAttr(0, ParamAttr::ReadOnly | ParamAttr::ReadNone);
+  }
+
   /// @brief Determine if the call cannot return.
   bool doesNotReturn() const {
     return paramHasAttr(0, ParamAttr::NoReturn);
   }
+  void setDoesNotReturn(bool doesNotReturn = true) {
+    if (doesNotReturn) addParamAttr(0, ParamAttr::NoReturn);
+    else removeParamAttr(0, ParamAttr::NoReturn);
+  }
 
   /// @brief Determine if the call cannot unwind.
   bool doesNotThrow() const {
     return paramHasAttr(0, ParamAttr::NoUnwind);
   }
-  void setDoesNotThrow(bool doesNotThrow = true);
+  void setDoesNotThrow(bool doesNotThrow = true) {
+    if (doesNotThrow) addParamAttr(0, ParamAttr::NoUnwind);
+    else removeParamAttr(0, ParamAttr::NoUnwind);
+  }
 
   /// @brief Determine if the call returns a structure through first 
   /// pointer argument.
@@ -2427,6 +2445,9 @@
   /// addParamAttr - adds the attribute to the list of attributes.
   void addParamAttr(unsigned i, ParameterAttributes attr);
 
+  /// removeParamAttr - removes the attribute from the list of attributes.
+  void removeParamAttr(unsigned i, ParameterAttributes attr);
+
   /// @brief Extract the alignment for a call or parameter (0=unknown).
   unsigned getParamAlignment(unsigned i) const {
     return ParamAttrs.getParamAlignment(i);
@@ -2436,22 +2457,37 @@
   bool doesNotAccessMemory() const {
     return paramHasAttr(0, ParamAttr::ReadNone);
   }
+  void setDoesNotAccessMemory(bool doesNotAccessMemory = true) {
+    if (doesNotAccessMemory) addParamAttr(0, ParamAttr::ReadNone);
+    else removeParamAttr(0, ParamAttr::ReadNone);
+  }
 
   /// @brief Determine if the call does not access or only reads memory.
   bool onlyReadsMemory() const {
     return doesNotAccessMemory() || paramHasAttr(0, ParamAttr::ReadOnly);
   }
+  void setOnlyReadsMemory(bool onlyReadsMemory = true) {
+    if (onlyReadsMemory) addParamAttr(0, ParamAttr::ReadOnly);
+    else removeParamAttr(0, ParamAttr::ReadOnly | ParamAttr::ReadNone);
+  }
 
   /// @brief Determine if the call cannot return.
   bool doesNotReturn() const {
     return paramHasAttr(0, ParamAttr::NoReturn);
   }
+  void setDoesNotReturn(bool doesNotReturn = true) {
+    if (doesNotReturn) addParamAttr(0, ParamAttr::NoReturn);
+    else removeParamAttr(0, ParamAttr::NoReturn);
+  }
 
   /// @brief Determine if the call cannot unwind.
   bool doesNotThrow() const {
     return paramHasAttr(0, ParamAttr::NoUnwind);
   }
-  void setDoesNotThrow(bool doesNotThrow = true);
+  void setDoesNotThrow(bool doesNotThrow = true) {
+    if (doesNotThrow) addParamAttr(0, ParamAttr::NoUnwind);
+    else removeParamAttr(0, ParamAttr::NoUnwind);
+  }
 
   /// @brief Determine if the call returns a structure through first 
   /// pointer argument.

Modified: llvm/trunk/include/llvm/Support/CallSite.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/CallSite.h?rev=53223&r1=53222&r2=53223&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Support/CallSite.h (original)
+++ llvm/trunk/include/llvm/Support/CallSite.h Tue Jul  8 03:38:44 2008
@@ -75,9 +75,15 @@
 
   /// @brief Determine if the call does not access memory.
   bool doesNotAccessMemory() const;
+  void setDoesNotAccessMemory(bool doesNotAccessMemory = true);
 
   /// @brief Determine if the call does not access or only reads memory.
   bool onlyReadsMemory() const;
+  void setOnlyReadsMemory(bool onlyReadsMemory = true);
+
+  /// @brief Determine if the call cannot return.
+  bool doesNotReturn() const;
+  void setDoesNotReturn(bool doesNotReturn = true);
 
   /// @brief Determine if the call cannot unwind.
   bool doesNotThrow() const;

Modified: llvm/trunk/lib/VMCore/Instructions.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Instructions.cpp?rev=53223&r1=53222&r2=53223&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Instructions.cpp (original)
+++ llvm/trunk/lib/VMCore/Instructions.cpp Tue Jul  8 03:38:44 2008
@@ -72,12 +72,36 @@
   else
     return cast<InvokeInst>(I)->doesNotAccessMemory();
 }
+void CallSite::setDoesNotAccessMemory(bool doesNotAccessMemory) {
+  if (CallInst *CI = dyn_cast<CallInst>(I))
+    CI->setDoesNotAccessMemory(doesNotAccessMemory);
+  else
+    cast<InvokeInst>(I)->setDoesNotAccessMemory(doesNotAccessMemory);
+}
 bool CallSite::onlyReadsMemory() const {
   if (CallInst *CI = dyn_cast<CallInst>(I))
     return CI->onlyReadsMemory();
   else
     return cast<InvokeInst>(I)->onlyReadsMemory();
 }
+void CallSite::setOnlyReadsMemory(bool onlyReadsMemory) {
+  if (CallInst *CI = dyn_cast<CallInst>(I))
+    CI->setOnlyReadsMemory(onlyReadsMemory);
+  else
+    cast<InvokeInst>(I)->setOnlyReadsMemory(onlyReadsMemory);
+}
+bool CallSite::doesNotReturn() const {
+  if (CallInst *CI = dyn_cast<CallInst>(I))
+    return CI->doesNotReturn();
+  else
+    return cast<InvokeInst>(I)->doesNotReturn();
+}
+void CallSite::setDoesNotReturn(bool doesNotReturn) {
+  if (CallInst *CI = dyn_cast<CallInst>(I))
+    CI->setDoesNotReturn(doesNotReturn);
+  else
+    cast<InvokeInst>(I)->setDoesNotReturn(doesNotReturn);
+}
 bool CallSite::doesNotThrow() const {
   if (CallInst *CI = dyn_cast<CallInst>(I))
     return CI->doesNotThrow();
@@ -384,6 +408,12 @@
   setParamAttrs(PAL);
 }
 
+void CallInst::removeParamAttr(unsigned i, ParameterAttributes attr) {
+  PAListPtr PAL = getParamAttrs();
+  PAL = PAL.removeAttr(i, attr);
+  setParamAttrs(PAL);
+}
+
 bool CallInst::paramHasAttr(unsigned i, ParameterAttributes attr) const {
   if (ParamAttrs.paramHasAttr(i, attr))
     return true;
@@ -392,15 +422,6 @@
   return false;
 }
 
-void CallInst::setDoesNotThrow(bool doesNotThrow) {
-  PAListPtr PAL = getParamAttrs();
-  if (doesNotThrow)
-    PAL = PAL.addAttr(0, ParamAttr::NoUnwind);
-  else
-    PAL = PAL.removeAttr(0, ParamAttr::NoUnwind);
-  setParamAttrs(PAL);
-}
-
 
 //===----------------------------------------------------------------------===//
 //                        InvokeInst Implementation
@@ -466,12 +487,9 @@
   setParamAttrs(PAL);
 }
 
-void InvokeInst::setDoesNotThrow(bool doesNotThrow) {
+void InvokeInst::removeParamAttr(unsigned i, ParameterAttributes attr) {
   PAListPtr PAL = getParamAttrs();
-  if (doesNotThrow)
-    PAL = PAL.addAttr(0, ParamAttr::NoUnwind);
-  else
-    PAL = PAL.removeAttr(0, ParamAttr::NoUnwind);
+  PAL = PAL.removeAttr(i, attr);
   setParamAttrs(PAL);
 }