diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2007-07-31 14:39:10 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2007-07-31 14:39:10 +0000 |
| commit | e87f23377c5d986a5113f122362a194ff5dfec59 (patch) | |
| tree | 59e7fe8e946e5a3a1daae546078ca3ed30998b4c | |
| parent | fee0a9c7ef5a55455d5351848207202431e3feda (diff) | |
After a discussion with Anton, it turns out that the InReg attribute is not
permitted on function results. So, revert the last patch to make it illegal.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@40632 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/AsmParser/llvmAsmParser.y | 1 | ||||
| -rw-r--r-- | lib/VMCore/Verifier.cpp | 3 |
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; |