commit a472f66dd0ec371399ed5d52271dff4f58833eb0
author Reid Spencer <rspencer@reidspencer.com> Wed Apr 11 02:44:20 2007 +0000
committer Reid Spencer <rspencer@reidspencer.com> Wed Apr 11 02:44:20 2007 +0000
tree 7552d0bd1980e118653eaa9160d1119ec6f26287
parent d3f622e0d5216247d773532bed0a9ec47d021f07

For PR1146:
Put the parameter attributes in their own ParamAttr name space. Adjust the
rest of llvm as a result.

llvm-svn: 35877

llvm/lib/VMCore/AsmWriter.cpp

diff --git a/llvm/lib/VMCore/AsmWriter.cpp b/llvm/lib/VMCore/AsmWriter.cpp
index ad6b7e3..f9bac80 100644
--- a/llvm/lib/VMCore/AsmWriter.cpp
+++ b/llvm/lib/VMCore/AsmWriter.cpp
@@ -291,7 +291,7 @@
       if (I != FTy->param_begin())
         Result += ", ";
       calcTypeName(*I, TypeStack, TypeNames, Result);
-      if (Attrs && Attrs->getParamAttrs(Idx) != NoAttributeSet) {
+      if (Attrs && Attrs->getParamAttrs(Idx) != ParamAttr::None) {
         Result += + " ";
         Result += Attrs->getParamAttrsTextByIndex(Idx);
       }
@@ -302,7 +302,7 @@
       Result += "...";
     }
     Result += ")";
-    if (Attrs && Attrs->getParamAttrs(0) != NoAttributeSet) {
+    if (Attrs && Attrs->getParamAttrs(0) != ParamAttr::None) {
       Result += " ";
       Result += Attrs->getParamAttrsTextByIndex(0);
     }
@@ -737,7 +737,7 @@
       if (I != FTy->param_begin())
         Out << ", ";
       printType(*I);
-      if (Attrs && Attrs->getParamAttrs(Idx) != NoAttributeSet) {
+      if (Attrs && Attrs->getParamAttrs(Idx) != ParamAttr::None) {
         Out << " " << Attrs->getParamAttrsTextByIndex(Idx);
       }
       Idx++;
@@ -747,7 +747,7 @@
       Out << "...";
     }
     Out << ')';
-    if (Attrs && Attrs->getParamAttrs(0) != NoAttributeSet)
+    if (Attrs && Attrs->getParamAttrs(0) != ParamAttr::None)
       Out << ' ' << Attrs->getParamAttrsTextByIndex(0);
   } else if (const StructType *STy = dyn_cast<StructType>(Ty)) {
     if (STy->isPacked())
@@ -974,7 +974,7 @@
     // Insert commas as we go... the first arg doesn't get a comma
     if (I != F->arg_begin()) Out << ", ";
     printArgument(I, (Attrs ? Attrs->getParamAttrs(Idx)
-                            : uint16_t(NoAttributeSet)));
+                            : uint16_t(ParamAttr::None)));
     Idx++;
   }
 
@@ -984,7 +984,7 @@
     Out << "...";  // Output varargs portion of signature!
   }
   Out << ')';
-  if (Attrs && Attrs->getParamAttrs(0) != NoAttributeSet)
+  if (Attrs && Attrs->getParamAttrs(0) != ParamAttr::None)
     Out << ' ' << Attrs->getParamAttrsTextByIndex(0);
   if (F->hasSection())
     Out << " section \"" << F->getSection() << '"';
@@ -1013,7 +1013,7 @@
   // Output type...
   printType(Arg->getType());
 
-  if (Attrs != NoAttributeSet)
+  if (Attrs != ParamAttr::None)
     Out << ' ' << ParamAttrsList::getParamAttrsText(Attrs);
 
   // Output name, if available...
@@ -1188,11 +1188,11 @@
       if (op > 1)
         Out << ',';
       writeOperand(I.getOperand(op), true);
-      if (PAL && PAL->getParamAttrs(op) != NoAttributeSet)
+      if (PAL && PAL->getParamAttrs(op) != ParamAttr::None)
         Out << " " << PAL->getParamAttrsTextByIndex(op);
     }
     Out << " )";
-    if (PAL && PAL->getParamAttrs(0) != NoAttributeSet)
+    if (PAL && PAL->getParamAttrs(0) != ParamAttr::None)
       Out << ' ' << PAL->getParamAttrsTextByIndex(0);
   } else if (const InvokeInst *II = dyn_cast<InvokeInst>(&I)) {
     const PointerType    *PTy = cast<PointerType>(Operand->getType());
@@ -1228,12 +1228,12 @@
       if (op > 3)
         Out << ',';
       writeOperand(I.getOperand(op), true);
-      if (PAL && PAL->getParamAttrs(op-2) != NoAttributeSet)
+      if (PAL && PAL->getParamAttrs(op-2) != ParamAttr::None)
         Out << " " << PAL->getParamAttrsTextByIndex(op-2);
     }
 
     Out << " )";
-    if (PAL && PAL->getParamAttrs(0) != NoAttributeSet)
+    if (PAL && PAL->getParamAttrs(0) != ParamAttr::None)
       Out << " " << PAL->getParamAttrsTextByIndex(0);
     Out << "\n\t\t\tto";
     writeOperand(II->getNormalDest(), true);