diff options
| author | Reid Kleckner <rnk@google.com> | 2017-04-10 20:34:19 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2017-04-10 20:34:19 +0000 |
| commit | 211b1f324fec79eddecccc4cb43a284bd3324cd5 (patch) | |
| tree | 79b6b6a51d322e61e42c702acf10511de901cee7 /llvm/lib/Transforms/IPO/MergeFunctions.cpp | |
| parent | d972949b10ef0b10fd73d5b153084217c535bb15 (diff) | |
| download | llvm-211b1f324fec79eddecccc4cb43a284bd3324cd5.zip llvm-211b1f324fec79eddecccc4cb43a284bd3324cd5.tar.gz llvm-211b1f324fec79eddecccc4cb43a284bd3324cd5.tar.bz2 | |
Revert "[IR] Make AttributeSetNode public, avoid temporary AttributeList copies"
This reverts r299875. A Linux bot came back with a test failure:
http://bb.pgr.jp/builders/test-clang-i686-linux-RA/builds/741/steps/test_clang/logs/Clang%20%3A%3A%20CodeGen__2006-05-19-SingleEltReturn.c
llvm-svn: 299878
Diffstat (limited to 'llvm/lib/Transforms/IPO/MergeFunctions.cpp')
| -rw-r--r-- | llvm/lib/Transforms/IPO/MergeFunctions.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/IPO/MergeFunctions.cpp b/llvm/lib/Transforms/IPO/MergeFunctions.cpp index 5d41ca9..dc73902 100644 --- a/llvm/lib/Transforms/IPO/MergeFunctions.cpp +++ b/llvm/lib/Transforms/IPO/MergeFunctions.cpp @@ -439,7 +439,8 @@ void MergeFunctions::replaceDirectCallers(Function *Old, Function *New) { Context, AttributeList::ReturnIndex, NewFuncAttrs.getRetAttributes()); for (unsigned argIdx = 0; argIdx < CS.arg_size(); argIdx++) { - if (AttributeSetNode *Attrs = NewFuncAttrs.getParamAttributes(argIdx)) + AttributeList Attrs = NewFuncAttrs.getParamAttributes(argIdx); + if (Attrs.getNumSlots()) CallSiteAttrs = CallSiteAttrs.addAttributes(Context, argIdx, Attrs); } |