[llvm-commits] [llvm-gcc-4.2] r56514 - in /llvm-gcc-4.2/trunk/gcc: llvm-abi.h llvm-convert.cpp llvm-types.cpp

[Devang Patel]

Author: dpatel
Date: Tue Sep 23 18:11:24 2008
New Revision: 56514

URL: http://llvm.org/viewvc/llvm-project?rev=56514&view=rev
Log:

s/ParameterAttributes/Attributes/g


Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-abi.h
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
    llvm-gcc-4.2/trunk/gcc/llvm-types.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-abi.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-abi.h?rev=56514&r1=56513&r2=56514&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-abi.h (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-abi.h Tue Sep 23 18:11:24 2008
@@ -32,7 +32,7 @@
 #include "llvm-internal.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
-#include "llvm/ParameterAttributes.h"
+#include "llvm/Attributes.h"
 #include "llvm/Target/TargetData.h"
 
 namespace llvm {
@@ -413,7 +413,7 @@
   /// should be handled.  This handles things like decimating structures into
   /// their fields.
   void HandleArgument(tree type, std::vector<const Type*> &ScalarElts,
-                      ParameterAttributes *Attributes = NULL) {
+                      Attributes *Attributes = NULL) {
     unsigned Size = 0;
     bool DontCheckAlignment = false;
     const Type *Ty = ConvertType(type);

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=56514&r1=56513&r2=56514&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Tue Sep 23 18:11:24 2008
@@ -2696,11 +2696,11 @@
       Client.pushAddress(ArgVal.Ptr);
     }
 
-    ParameterAttributes Attributes = ParamAttr::None;
+    Attributes Attrs = ParamAttr::None;
     ABIConverter.HandleArgument(TREE_TYPE(TREE_VALUE(arg)), ScalarArgs,
-                                &Attributes);
-    if (Attributes != ParamAttr::None)
-      PAL = PAL.addAttr(CallOperands.size(), Attributes);
+                                &Attrs);
+    if (Attrs != ParamAttr::None)
+      PAL = PAL.addAttr(CallOperands.size(), Attrs);
 
     Client.clear();
   }

Modified: llvm-gcc-4.2/trunk/gcc/llvm-types.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-types.cpp?rev=56514&r1=56513&r2=56514&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-types.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-types.cpp Tue Sep 23 18:11:24 2008
@@ -1025,7 +1025,7 @@
 }
 
 
-static ParameterAttributes HandleArgumentExtension(tree ArgTy) {
+static Attributes HandleArgumentExtension(tree ArgTy) {
   if (TREE_CODE(ArgTy) == BOOLEAN_TYPE) {
     if (TREE_INT_CST_LOW(TYPE_SIZE(ArgTy)) < INT_TYPE_SIZE)
       return ParamAttr::ZExt;
@@ -1061,7 +1061,7 @@
   SmallVector<ParamAttrsWithIndex, 8> Attrs;
 
   // Compute whether the result needs to be zext or sext'd.
-  ParameterAttributes RAttributes = HandleArgumentExtension(ReturnType);
+  Attributes RAttributes = HandleArgumentExtension(ReturnType);
 
   if (RAttributes != ParamAttr::None)
     Attrs.push_back(ParamAttrsWithIndex::get(0, RAttributes));
@@ -1085,7 +1085,7 @@
     tree ArgTy = TREE_TYPE(Args);
 
     // Determine if there are any attributes for this param.
-    ParameterAttributes Attributes = ParamAttr::None;
+    Attributes Attributes = ParamAttr::None;
 
     ABIConverter.HandleArgument(ArgTy, ScalarArgs, &Attributes);
 
@@ -1119,7 +1119,7 @@
 
   // Compute attributes for return type (and function attributes).
   SmallVector<ParamAttrsWithIndex, 8> Attrs;
-  ParameterAttributes RAttributes = ParamAttr::None;
+  Attributes RAttributes = ParamAttr::None;
 
   int flags = flags_from_decl_or_type(decl ? decl : type);
 
@@ -1211,7 +1211,7 @@
     }
     
     // Determine if there are any attributes for this param.
-    ParameterAttributes Attributes = ParamAttr::None;
+    Attributes Attributes = ParamAttr::None;
     
     ABIConverter.HandleArgument(ArgTy, ScalarArgs, &Attributes);
 
@@ -1253,7 +1253,7 @@
   // write through the byval pointer argument, which LLVM does not allow for
   // readonly/readnone functions.
   if (HasByVal && Attrs[0].Index == 0) {
-    ParameterAttributes &RAttrs = Attrs[0].Attrs;
+    Attributes &RAttrs = Attrs[0].Attrs;
     RAttrs &= ~(ParamAttr::ReadNone | ParamAttr::ReadOnly);
     if (RAttrs == ParamAttr::None)
       Attrs.erase(Attrs.begin());