1 files changed, 7 insertions, 13 deletions
diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp
index 7533185be1..1b4e39f952 100644
--- a/lib/VMCore/Function.cpp
+++ b/lib/VMCore/Function.cpp
@@ -113,18 +113,15 @@ bool Argument::hasStructRetAttr() const {
 
 /// addAttr - Add a ParamAttr to an argument
 void Argument::addAttr(ParameterAttributes attr) {
-  getParent()->setParamAttrs(
-    getParent()->getParamAttrs().addAttr(getArgNo() + 1, attr));
+  getParent()->addParamAttr(getArgNo() + 1, attr);
 }
-  
+
 /// removeAttr - Remove a ParamAttr from an argument
 void Argument::removeAttr(ParameterAttributes attr) {
-  getParent()->setParamAttrs(
-    getParent()->getParamAttrs().removeAttr(getArgNo() + 1, attr));
+  getParent()->removeParamAttr(getArgNo() + 1, attr);
 }
 
 
-
 //===----------------------------------------------------------------------===//
 // Helper Methods in Function
 //===----------------------------------------------------------------------===//
@@ -231,18 +228,15 @@ void Function::dropAllReferences() {
   BasicBlocks.clear();    // Delete all basic blocks...
 }
 
-void Function::setDoesNotThrow(bool doesNotThrow) {
+void Function::addParamAttr(unsigned i, ParameterAttributes attr) {
   PAListPtr PAL = getParamAttrs();
-  if (doesNotThrow)
-    PAL = PAL.addAttr(0, ParamAttr::NoUnwind);
-  else
-    PAL = PAL.removeAttr(0, ParamAttr::NoUnwind);
+  PAL = PAL.addAttr(i, attr);
   setParamAttrs(PAL);
 }
 
-void Function::addParamAttr(unsigned i, ParameterAttributes attr) {
+void Function::removeParamAttr(unsigned i, ParameterAttributes attr) {
   PAListPtr PAL = getParamAttrs();
-  PAL = PAL.addAttr(i, attr);
+  PAL = PAL.removeAttr(i, attr);
   setParamAttrs(PAL);
 }