diff options
author | Reid Kleckner <rnk@google.com> | 2017-04-10 23:31:05 +0000 |
---|---|---|
committer | Reid Kleckner <rnk@google.com> | 2017-04-10 23:31:05 +0000 |
commit | eb9dd5b87f43cbd9641fba0555b775589e49af33 (patch) | |
tree | 3aed507a5bb8b601a92c13399bf2a54d54fed432 /llvm/lib/Transforms/Utils/CodeExtractor.cpp | |
parent | 75696ffa2533abb4e4db406d4e2de42e86197413 (diff) | |
download | bcm5719-llvm-eb9dd5b87f43cbd9641fba0555b775589e49af33.tar.gz bcm5719-llvm-eb9dd5b87f43cbd9641fba0555b775589e49af33.zip |
Reland "[IR] Make AttributeSetNode public, avoid temporary AttributeList copies"
This re-lands r299875.
I introduced a bug in Clang code responsible for replacing K&R, no
prototype declarations with a real function definition with a prototype.
The bug was here:
// Collect any return attributes from the call.
- if (oldAttrs.hasAttributes(llvm::AttributeList::ReturnIndex))
- newAttrs.push_back(llvm::AttributeList::get(newFn->getContext(),
- oldAttrs.getRetAttributes()));
+ newAttrs.push_back(oldAttrs.getRetAttributes());
Previously getRetAttributes() carried AttributeList::ReturnIndex in its
AttributeList. Now that we return the AttributeSetNode* directly, it no
longer carries that index, and we call this overload with a single node:
AttributeList::get(LLVMContext&, ArrayRef<AttributeSetNode*>)
That aborted with an assertion on x86_32 targets. I added an explicit
triple to the test and added CHECKs to help find issues like this in the
future sooner.
llvm-svn: 299899
Diffstat (limited to 'llvm/lib/Transforms/Utils/CodeExtractor.cpp')
-rw-r--r-- | llvm/lib/Transforms/Utils/CodeExtractor.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/llvm/lib/Transforms/Utils/CodeExtractor.cpp b/llvm/lib/Transforms/Utils/CodeExtractor.cpp index a7f7993520e..644d93b727b 100644 --- a/llvm/lib/Transforms/Utils/CodeExtractor.cpp +++ b/llvm/lib/Transforms/Utils/CodeExtractor.cpp @@ -362,8 +362,7 @@ Function *CodeExtractor::constructFunction(const ValueSet &inputs, // "target-features" attribute allowing it to be lowered. // FIXME: This should be changed to check to see if a specific // attribute can not be inherited. - AttributeList OldFnAttrs = oldFunction->getAttributes().getFnAttributes(); - AttrBuilder AB(OldFnAttrs, AttributeList::FunctionIndex); + AttrBuilder AB(oldFunction->getAttributes().getFnAttributes()); for (const auto &Attr : AB.td_attrs()) newFunction->addFnAttr(Attr.first, Attr.second); |