allow inreg on the result of a function

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

diff --git a/include/llvm/ParameterAttributes.h b/include/llvm/ParameterAttributes.h
index 919c460337ad4eb09d83d879034b179899a3e3f5..16f798ee2a48fe1ab4a00b61ae5ac2412c6993c2 100644 (file)
--- a/include/llvm/ParameterAttributes.h
+++ b/include/llvm/ParameterAttributes.h
@@ -48,7 +48,7 @@ const Attributes Alignment = 0xffff<<16; ///< Alignment of parameter (16 bits)
                                     // 0 = unknown, else in clear (not log)
 
 /// @brief Attributes that only apply to function parameters.
-const Attributes ParameterOnly = ByVal | InReg | Nest | StructRet;
+const Attributes ParameterOnly = ByVal | Nest | StructRet;
 
 /// @brief Attributes that only apply to function return values.
 const Attributes ReturnOnly = NoReturn | NoUnwind | ReadNone | ReadOnly;

diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y
index edc84c1fa14748a7135bb2a4bdeecf18e83b01b0..a298dde43426063483ec0106f119507f3ed2d268 100644 (file)
--- a/lib/AsmParser/llvmAsmParser.y
+++ b/lib/AsmParser/llvmAsmParser.y
@@ -1282,6 +1282,7 @@ OptParamAttrs : /* empty */  { $$ = ParamAttr::None; }
 
 FuncAttr      : NORETURN { $$ = ParamAttr::NoReturn; }
               | NOUNWIND { $$ = ParamAttr::NoUnwind; }
+              | INREG    { $$ = ParamAttr::InReg;     }
               | ZEROEXT  { $$ = ParamAttr::ZExt;     }
               | SIGNEXT  { $$ = ParamAttr::SExt;     }
               | READNONE { $$ = ParamAttr::ReadNone; }