From c103e8add9a1ac71f2ed74b5598ff863bd0616d8 Mon Sep 17 00:00:00 2001
From: Reid Spencer <rspencer@reidspencer.com>
Date: Tue, 31 Jul 2007 14:39:10 +0000
Subject: [PATCH] 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.

llvm-svn: 40632
---
 lib/AsmParser/llvmAsmParser.y | 1 -
 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 584eb8fdffb..fd2713f3071 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 5c4e1b36843..6d4aa986f71 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;