[llvm-commits] CVS: llvm/lib/VMCore/ConstantFolding.cpp Constants.cpp Instructions.cpp Type.cpp Verifier.cpp

[Reid Spencer]

Changes in directory llvm/lib/VMCore:

ConstantFolding.cpp updated: 1.136 -> 1.137
Constants.cpp updated: 1.210 -> 1.211
Instructions.cpp updated: 1.76 -> 1.77
Type.cpp updated: 1.173 -> 1.174
Verifier.cpp updated: 1.196 -> 1.197
---
Log message:

For PR1195: http://llvm.org/PR1195 :
Change use of "packed" term to "vector" in comments, strings, variable
names, etc.


---
Diffs of the changes:  (+10 -10)

 ConstantFolding.cpp |    2 +-
 Constants.cpp       |   12 ++++++------
 Instructions.cpp    |    2 +-
 Type.cpp            |    2 +-
 Verifier.cpp        |    2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)


Index: llvm/lib/VMCore/ConstantFolding.cpp
diff -u llvm/lib/VMCore/ConstantFolding.cpp:1.136 llvm/lib/VMCore/ConstantFolding.cpp:1.137
--- llvm/lib/VMCore/ConstantFolding.cpp:1.136	Wed Feb 14 20:26:10 2007
+++ llvm/lib/VMCore/ConstantFolding.cpp	Wed Feb 14 21:39:18 2007
@@ -36,7 +36,7 @@
 //===----------------------------------------------------------------------===//
 
 /// CastConstantVector - Convert the specified ConstantVector node to the
-/// specified packed type.  At this point, we know that the elements of the
+/// specified vector type.  At this point, we know that the elements of the
 /// input packed constant are all simple integer or FP values.
 static Constant *CastConstantVector(ConstantVector *CP,
                                     const VectorType *DstTy) {


Index: llvm/lib/VMCore/Constants.cpp
diff -u llvm/lib/VMCore/Constants.cpp:1.210 llvm/lib/VMCore/Constants.cpp:1.211
--- llvm/lib/VMCore/Constants.cpp:1.210	Wed Feb 14 20:26:10 2007
+++ llvm/lib/VMCore/Constants.cpp	Wed Feb 14 21:39:18 2007
@@ -1135,7 +1135,7 @@
 }
 
 static ManagedStatic<ValueMap<std::vector<Constant*>, VectorType,
-                              ConstantVector> > PackedConstants;
+                              ConstantVector> > VectorConstants;
 
 Constant *ConstantVector::get(const VectorType *Ty,
                               const std::vector<Constant*> &V) {
@@ -1143,10 +1143,10 @@
   if (!V.empty()) {
     Constant *C = V[0];
     if (!C->isNullValue())
-      return PackedConstants->getOrCreate(Ty, V);
+      return VectorConstants->getOrCreate(Ty, V);
     for (unsigned i = 1, e = V.size(); i != e; ++i)
       if (V[i] != C)
-        return PackedConstants->getOrCreate(Ty, V);
+        return VectorConstants->getOrCreate(Ty, V);
   }
   return ConstantAggregateZero::get(Ty);
 }
@@ -1159,7 +1159,7 @@
 // destroyConstant - Remove the constant from the constant table...
 //
 void ConstantVector::destroyConstant() {
-  PackedConstants->remove(this);
+  VectorConstants->remove(this);
   destroyConstantImpl();
 }
 
@@ -1793,7 +1793,7 @@
 
 Constant *ConstantExpr::getExtractElement(Constant *Val, Constant *Idx) {
   assert(isa<VectorType>(Val->getType()) &&
-         "Tried to create extractelement operation on non-packed type!");
+         "Tried to create extractelement operation on non-vector type!");
   assert(Idx->getType() == Type::Int32Ty &&
          "Extractelement index must be i32 type!");
   return getExtractElementTy(cast<VectorType>(Val->getType())->getElementType(),
@@ -1815,7 +1815,7 @@
 Constant *ConstantExpr::getInsertElement(Constant *Val, Constant *Elt, 
                                          Constant *Idx) {
   assert(isa<VectorType>(Val->getType()) &&
-         "Tried to create insertelement operation on non-packed type!");
+         "Tried to create insertelement operation on non-vector type!");
   assert(Elt->getType() == cast<VectorType>(Val->getType())->getElementType()
          && "Insertelement types must match!");
   assert(Idx->getType() == Type::Int32Ty &&


Index: llvm/lib/VMCore/Instructions.cpp
diff -u llvm/lib/VMCore/Instructions.cpp:1.76 llvm/lib/VMCore/Instructions.cpp:1.77
--- llvm/lib/VMCore/Instructions.cpp:1.76	Wed Feb 14 20:26:10 2007
+++ llvm/lib/VMCore/Instructions.cpp	Wed Feb 14 21:39:18 2007
@@ -1000,7 +1000,7 @@
 bool InsertElementInst::isValidOperands(const Value *Vec, const Value *Elt, 
                                         const Value *Index) {
   if (!isa<VectorType>(Vec->getType()))
-    return false;   // First operand of insertelement must be packed type.
+    return false;   // First operand of insertelement must be vector type.
   
   if (Elt->getType() != cast<VectorType>(Vec->getType())->getElementType())
     return false;// Second operand of insertelement must be packed element type.


Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.173 llvm/lib/VMCore/Type.cpp:1.174
--- llvm/lib/VMCore/Type.cpp:1.173	Wed Feb 14 21:11:50 2007
+++ llvm/lib/VMCore/Type.cpp	Wed Feb 14 21:39:18 2007
@@ -110,7 +110,7 @@
   if (!this->isFirstClassType() || !Ty->isFirstClassType())
     return false;
 
-  // Packed -> Packed conversions are always lossless if the two packed types
+  // Vector -> Vector conversions are always lossless if the two vector types
   // have the same size, otherwise not.
   if (const VectorType *thisPTy = dyn_cast<VectorType>(this))
     if (const VectorType *thatPTy = dyn_cast<VectorType>(Ty))


Index: llvm/lib/VMCore/Verifier.cpp
diff -u llvm/lib/VMCore/Verifier.cpp:1.196 llvm/lib/VMCore/Verifier.cpp:1.197
--- llvm/lib/VMCore/Verifier.cpp:1.196	Wed Feb 14 20:26:10 2007
+++ llvm/lib/VMCore/Verifier.cpp	Wed Feb 14 21:39:18 2007
@@ -720,7 +720,7 @@
             &B);
     Assert1(B.getType()->isInteger() || B.getType()->isFloatingPoint() ||
             isa<VectorType>(B.getType()),
-            "Arithmetic operators must have integer, fp, or packed type!", &B);
+            "Arithmetic operators must have integer, fp, or vector type!", &B);
     break;
   }