1. Make sure we print the Function Value for parameter attribute errors

2. Fold an if statement into the Assert1 macro call.

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

diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp
index 6da36452fcda5e8ad0ca9ea3bd49854f226ce3e8..8bebcdddcea8cf7231f61864d2015733b30377a2 100644 (file)
--- a/lib/VMCore/Verifier.cpp
+++ b/lib/VMCore/Verifier.cpp
@@ -362,12 +362,12 @@ void Verifier::visitFunction(Function &F) {
   if (const ParamAttrsList *Attrs = FT->getParamAttrs()) {
     unsigned Idx = 1;
 
-    Assert(!Attrs->paramHasAttr(0, ParamAttr::ByVal),
-           "Attribute ByVal should not apply to functions!");
-    Assert(!Attrs->paramHasAttr(0, ParamAttr::StructRet),
-           "Attribute SRet should not apply to functions!");
-    Assert(!Attrs->paramHasAttr(0, ParamAttr::InReg),
-           "Attribute SRet should not apply to functions!");
+    Assert1(!Attrs->paramHasAttr(0, ParamAttr::ByVal),
+            "Attribute ByVal should not apply to functions!", &F);
+    Assert1(!Attrs->paramHasAttr(0, ParamAttr::StructRet),
+            "Attribute SRet should not apply to functions!", &F);
+    Assert1(!Attrs->paramHasAttr(0, ParamAttr::InReg),
+            "Attribute SRet should not apply to functions!", &F);
 
     for (FunctionType::param_iterator I = FT->param_begin(), 
          E = FT->param_end(); I != E; ++I, ++Idx) {
@@ -391,10 +391,10 @@ void Verifier::visitFunction(Function &F) {
                 "Attribute ByVal should only apply to pointer to structs!", &F);
       }
 
-      if (Attrs->paramHasAttr(Idx, ParamAttr::NoReturn))
-        Assert1(0, "Attribute NoReturn should only be applied to function", &F);
-      if (Attrs->paramHasAttr(Idx, ParamAttr::NoUnwind))
-        Assert1(0, "Attribute NoUnwind should only be applied to function", &F);
+      Assert1(!Attrs->paramHasAttr(Idx, ParamAttr::NoReturn), 
+             "Attribute NoReturn should only be applied to function", &F);
+      Assert1(!Attrs->paramHasAttr(Idx, ParamAttr::NoUnwind),
+             "Attribute NoUnwind should only be applied to function", &F);
     }
   }