[llvm-commits] [llvm] r40632 - in /llvm/trunk/lib: AsmParser/llvmAsmParser.y VMCore/Verifier.cpp

[Reid Spencer]

Author: reid
Date: Tue Jul 31 09:39:10 2007
New Revision: 40632

URL: http://llvm.org/viewvc/llvm-project?rev=40632&view=rev
Log:
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.

Modified:
    llvm/trunk/lib/AsmParser/llvmAsmParser.y
    llvm/trunk/lib/VMCore/Verifier.cpp

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y?rev=40632&r1=40631&r2=40632&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Tue Jul 31 09:39:10 2007
@@ -1245,7 +1245,6 @@
               | NOUNWIND { $$ = ParamAttr::NoUnwind; }
               | ZEROEXT  { $$ = ParamAttr::ZExt;     }
               | SIGNEXT  { $$ = ParamAttr::SExt;     }
-              | INREG    { $$ = ParamAttr::InReg;    }
               ;
 
 OptFuncAttrs  : /* empty */ { $$ = ParamAttr::None; }

Modified: llvm/trunk/lib/VMCore/Verifier.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=40632&r1=40631&r2=40632&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Verifier.cpp (original)
+++ llvm/trunk/lib/VMCore/Verifier.cpp Tue Jul 31 09:39:10 2007
@@ -358,7 +358,8 @@
           "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;