[llvm-commits] [llvm] r40554 - /llvm/trunk/lib/VMCore/Verifier.cpp

[Duncan Sands]

Author: baldrick
Date: Fri Jul 27 11:45:18 2007
New Revision: 40554

URL: http://llvm.org/viewvc/llvm-project?rev=40554&view=rev
Log:
It seems logical that InReg should be incompatible
with StructReturn and ByVal, so make it so.

Modified:
    llvm/trunk/lib/VMCore/Verifier.cpp

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

==============================================================================
--- llvm/trunk/lib/VMCore/Verifier.cpp (original)
+++ llvm/trunk/lib/VMCore/Verifier.cpp Fri Jul 27 11:45:18 2007
@@ -365,7 +365,8 @@
     ParamAttr::NoReturn | ParamAttr::NoUnwind;
 
   const uint16_t MutuallyIncompatible =
-    ParamAttr::ByVal | ParamAttr::Nest | ParamAttr::StructRet;
+    ParamAttr::ByVal | ParamAttr::InReg |
+    ParamAttr::Nest  | ParamAttr::StructRet;
 
   const uint16_t IntegerTypeOnly =
     ParamAttr::SExt | ParamAttr::ZExt;
@@ -417,8 +418,6 @@
       if (Attrs->paramHasAttr(Idx, ParamAttr::Nest)) {
         Assert1(!SawNest, "More than one parameter has attribute nest!", &F);
         SawNest = true;
-        Assert1(!Attrs->paramHasAttr(Idx, ParamAttr::InReg),
-                "Attributes nest and inreg are incompatible!", &F);
       }
 
       if (Attrs->paramHasAttr(Idx, ParamAttr::StructRet)) {