From a9831cce1e7a74f507071073fcea29f81c413aac Mon Sep 17 00:00:00 2001 From: Arthur Eubanks Date: Fri, 13 Aug 2021 11:37:26 -0700 Subject: [PATCH] [NFC] Remove public uses of AttributeList::getAttributes() Use methods that better convey the intent. --- llvm/lib/Transforms/Utils/AssumeBundleBuilder.cpp | 15 +++++++-------- llvm/unittests/IR/AttributesTest.cpp | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/llvm/lib/Transforms/Utils/AssumeBundleBuilder.cpp b/llvm/lib/Transforms/Utils/AssumeBundleBuilder.cpp index dd96c76..259b802 100644 --- a/llvm/lib/Transforms/Utils/AssumeBundleBuilder.cpp +++ b/llvm/lib/Transforms/Utils/AssumeBundleBuilder.cpp @@ -203,21 +203,20 @@ struct AssumeBuilderState { } void addCall(const CallBase *Call) { - auto addAttrList = [&](AttributeList AttrList) { - for (unsigned Idx = AttributeList::FirstArgIndex; - Idx < AttrList.getNumAttrSets(); Idx++) - for (Attribute Attr : AttrList.getAttributes(Idx)) { + auto addAttrList = [&](AttributeList AttrList, unsigned NumArgs) { + for (unsigned Idx = 0; Idx < NumArgs; Idx++) + for (Attribute Attr : AttrList.getParamAttrs(Idx)) { bool IsPoisonAttr = Attr.hasAttribute(Attribute::NonNull) || Attr.hasAttribute(Attribute::Alignment); - if (!IsPoisonAttr || Call->isPassingUndefUB(Idx - 1)) - addAttribute(Attr, Call->getArgOperand(Idx - 1)); + if (!IsPoisonAttr || Call->isPassingUndefUB(Idx)) + addAttribute(Attr, Call->getArgOperand(Idx)); } for (Attribute Attr : AttrList.getFnAttrs()) addAttribute(Attr, nullptr); }; - addAttrList(Call->getAttributes()); + addAttrList(Call->getAttributes(), Call->arg_size()); if (Function *Fn = Call->getCalledFunction()) - addAttrList(Fn->getAttributes()); + addAttrList(Fn->getAttributes(), Fn->arg_size()); } AssumeInst *build() { diff --git a/llvm/unittests/IR/AttributesTest.cpp b/llvm/unittests/IR/AttributesTest.cpp index 4ba7900..30664b1 100644 --- a/llvm/unittests/IR/AttributesTest.cpp +++ b/llvm/unittests/IR/AttributesTest.cpp @@ -54,7 +54,7 @@ TEST(Attributes, Ordering) { AttributeList::get(C, 1, Attribute::SExt)}; AttributeList SetA = AttributeList::get(C, ASs); - AttributeList SetB = SetA.removeAttributes(C, 1, ASs[1].getAttributes(1)); + AttributeList SetB = SetA.removeAttributes(C, 1, ASs[1].getParamAttrs(0)); EXPECT_NE(SetA, SetB); } -- 2.7.4