commit f54676234a9826fc987512301d4dea36405c2c42
author Bill Wendling <isanbard@gmail.com> Tue Feb 12 10:13:06 2013 +0000
committer Bill Wendling <isanbard@gmail.com> Tue Feb 12 10:13:06 2013 +0000
tree c6afc588467e56c42a27b1d4bebecaeab007f5d5
parent d7fdee493b016a54a8a6fbdd3359576488fad582

Merge the collected attributes into the call instruction's attributes.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@174955 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AsmParser/LLParser.cpp

diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp
index e4f8d1f..c4b2c0f 100644
--- a/lib/AsmParser/LLParser.cpp
+++ b/lib/AsmParser/LLParser.cpp
@@ -102,7 +102,7 @@
       AttrBuilder FnAttrs(AS.getFnAttributes(), AttributeSet::FunctionIndex);
       AS = AS.removeAttributes(Context, AttributeSet::FunctionIndex,
                                AS.getFnAttributes());
-
+      FnAttrs.merge(B);
       AS = AS.addAttributes(Context, AttributeSet::FunctionIndex,
                             AttributeSet::get(Context,
                                               AttributeSet::FunctionIndex,
@@ -113,7 +113,7 @@
       AttrBuilder FnAttrs(AS.getFnAttributes(), AttributeSet::FunctionIndex);
       AS = AS.removeAttributes(Context, AttributeSet::FunctionIndex,
                                AS.getFnAttributes());
-
+      FnAttrs.merge(B);
       AS = AS.addAttributes(Context, AttributeSet::FunctionIndex,
                             AttributeSet::get(Context,
                                               AttributeSet::FunctionIndex,