aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/AsmParser/llvmAsmParser.y1
-rw-r--r--lib/VMCore/Verifier.cpp3
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y
index 584eb8fdff..fd2713f307 100644
--- a/lib/AsmParser/llvmAsmParser.y
+++ b/lib/AsmParser/llvmAsmParser.y
@@ -1245,7 +1245,6 @@ FuncAttr : NORETURN { $$ = ParamAttr::NoReturn; }
| NOUNWIND { $$ = ParamAttr::NoUnwind; }
| ZEROEXT { $$ = ParamAttr::ZExt; }
| SIGNEXT { $$ = ParamAttr::SExt; }
- | INREG { $$ = ParamAttr::InReg; }
;
OptFuncAttrs : /* empty */ { $$ = ParamAttr::None; }
diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp
index 5c4e1b3684..6d4aa986f7 100644
--- a/lib/VMCore/Verifier.cpp
+++ b/lib/VMCore/Verifier.cpp
@@ -358,7 +358,8 @@ void Verifier::visitFunction(Function &F) {
"Invalid struct-return function!", &F);
const uint16_t ReturnIncompatible =
- ParamAttr::ByVal | ParamAttr::Nest | ParamAttr::StructRet;
+ ParamAttr::ByVal | ParamAttr::InReg |
+ ParamAttr::Nest | ParamAttr::StructRet;
const uint16_t ParameterIncompatible =
ParamAttr::NoReturn | ParamAttr::NoUnwind;