commit 749a43d874f06127fa163efff456693e29124aeb
author Bill Wendling <isanbard@gmail.com> Sun Dec 30 13:50:49 2012 +0000
committer Bill Wendling <isanbard@gmail.com> Sun Dec 30 13:50:49 2012 +0000
tree 250a92158e98d233cdf18f64c1bb176df12ce84a
parent 74dba875e2f2d60919f0151022a995ef4883efb5

Use the predicate methods off of AttributeSet instead of Attribute.

llvm-svn: 171257

llvm/lib/VMCore/Instructions.cpp

diff --git a/llvm/lib/VMCore/Instructions.cpp b/llvm/lib/VMCore/Instructions.cpp
index 23db336..dffd13c 100644
--- a/llvm/lib/VMCore/Instructions.cpp
+++ b/llvm/lib/VMCore/Instructions.cpp
@@ -344,8 +344,7 @@
 }
 
 bool CallInst::hasFnAttr(Attribute::AttrKind A) const {
-  if (AttributeList.getParamAttributes(AttributeSet::FunctionIndex)
-      .hasAttribute(A))
+  if (AttributeList.hasAttribute(AttributeSet::FunctionIndex, A))
     return true;
   if (const Function *F = getCalledFunction())
     return F->getAttributes().hasAttribute(AttributeSet::FunctionIndex, A);
@@ -353,7 +352,7 @@
 }
 
 bool CallInst::paramHasAttr(unsigned i, Attribute::AttrKind A) const {
-  if (AttributeList.getParamAttributes(i).hasAttribute(A))
+  if (AttributeList.hasAttribute(i, A))
     return true;
   if (const Function *F = getCalledFunction())
     return F->getAttributes().hasAttribute(i, A);
@@ -573,8 +572,7 @@
 }
 
 bool InvokeInst::hasFnAttr(Attribute::AttrKind A) const {
-  if (AttributeList.getParamAttributes(AttributeSet::FunctionIndex).
-      hasAttribute(A))
+  if (AttributeList.hasAttribute(AttributeSet::FunctionIndex, A))
     return true;
   if (const Function *F = getCalledFunction())
     return F->getAttributes().hasAttribute(AttributeSet::FunctionIndex, A);
@@ -582,7 +580,7 @@
 }
 
 bool InvokeInst::paramHasAttr(unsigned i, Attribute::AttrKind A) const {
-  if (AttributeList.getParamAttributes(i).hasAttribute(A))
+  if (AttributeList.hasAttribute(i, A))
     return true;
   if (const Function *F = getCalledFunction())
     return F->getAttributes().hasAttribute(i, A);