aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/AsmParser/llvmAsmParser.y1
-rw-r--r--lib/Bitcode/Writer/BitcodeWriter.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y
index effe097258..b2667a34e9 100644
--- a/lib/AsmParser/llvmAsmParser.y
+++ b/lib/AsmParser/llvmAsmParser.y
@@ -1233,6 +1233,7 @@ ParamAttr : ZEROEXT { $$ = ParamAttr::ZExt; }
| NOALIAS { $$ = ParamAttr::NoAlias; }
| BYVAL { $$ = ParamAttr::ByVal; }
| NEST { $$ = ParamAttr::Nest; }
+ | ALIGN EUINT64VAL { $$ = $2 << 16; }
;
OptParamAttrs : /* empty */ { $$ = ParamAttr::None; }
diff --git a/lib/Bitcode/Writer/BitcodeWriter.cpp b/lib/Bitcode/Writer/BitcodeWriter.cpp
index 3f7cfcc209..fe013e8156 100644
--- a/lib/Bitcode/Writer/BitcodeWriter.cpp
+++ b/lib/Bitcode/Writer/BitcodeWriter.cpp
@@ -119,7 +119,7 @@ static void WriteParamAttrTable(const ValueEnumerator &VE,
const ParamAttrsList *A = Attrs[i];
for (unsigned op = 0, e = A->size(); op != e; ++op) {
Record.push_back(A->getParamIndex(op));
- Record.push_back((uint16_t)A->getParamAttrsAtIndex(op));
+ Record.push_back(A->getParamAttrsAtIndex(op));
}
Stream.EmitRecord(bitc::PARAMATTR_CODE_ENTRY, Record);