summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2013-02-12 10:13:06 +0000
committerBill Wendling <isanbard@gmail.com>2013-02-12 10:13:06 +0000
commit59dce37a820a2f7dda6d40100861b7e43aac3daa (patch)
treee7add152a0a3aeb81b98410f056fa460e1487b4d
parent7321fec934b05e9cc33fa51d7d112d8267dfe0ca (diff)
downloadbcm5719-llvm-59dce37a820a2f7dda6d40100861b7e43aac3daa.tar.gz
bcm5719-llvm-59dce37a820a2f7dda6d40100861b7e43aac3daa.zip
Merge the collected attributes into the call instruction's attributes.
llvm-svn: 174955
-rw-r--r--llvm/lib/AsmParser/LLParser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp
index e4f8d1fec41..c4b2c0f9bcd 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,
OpenPOWER on IntegriCloud