From: Bill Wendling <isanbard@gmail.com>
Date: Tue, 12 Feb 2013 10:13:06 +0000 (+0000)
Subject: Merge the collected attributes into the call instruction's attributes.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=59dce37a820a2f7dda6d40100861b7e43aac3daa;p=platform%2Fupstream%2Fllvm.git

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

llvm-svn: 174955
---

diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp
index e4f8d1f..c4b2c0f 100644
--- a/llvm/lib/AsmParser/LLParser.cpp
+++ b/llvm/lib/AsmParser/LLParser.cpp
@@ -102,7 +102,7 @@ bool LLParser::ValidateEndOfModule() {
       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 @@ bool LLParser::ValidateEndOfModule() {
       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,