2 files changed, 10 insertions, 10 deletions

diff --git a/llvm/lib/Transforms/Scalar/LowerPacked.cpp b/llvm/lib/Transforms/Scalar/LowerPacked.cpp
index d8416853d67..4e1d280b1ec 100644
--- a/llvm/lib/Transforms/Scalar/LowerPacked.cpp
+++ b/llvm/lib/Transforms/Scalar/LowerPacked.cpp
@@ -207,7 +207,7 @@ std::vector<Value*>& LowerPacked::getValues(Value* value)
 
 void LowerPacked::visitLoadInst(LoadInst& LI)
 {
-   // Make sure what we are dealing with is a packed type
+   // Make sure what we are dealing with is a vector type
    if (const VectorType* PKT = dyn_cast<VectorType>(LI.getType())) {
        // Initialization, Idx is needed for getelementptr needed later
        std::vector<Value*> Idx(2);
@@ -217,7 +217,7 @@ void LowerPacked::visitLoadInst(LoadInst& LI)
                                       PKT->getNumElements());
        PointerType* APT = PointerType::get(AT);
 
-       // Cast the pointer to packed type to an equivalent array
+       // Cast the pointer to vector type to an equivalent array
        Value* array = new BitCastInst(LI.getPointerOperand(), APT, 
                                       LI.getName() + ".a", &LI);
 
diff --git a/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp b/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
index 480f2aae2ff..70bb6a687ae 100644
--- a/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
+++ b/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
@@ -561,12 +561,12 @@ const Type *SROA::CanConvertToScalar(Value *V, bool &IsNotTrivial) {
         
         if (const ArrayType *ATy = dyn_cast<ArrayType>(AggTy)) {
           if (Idx >= ATy->getNumElements()) return 0;  // Out of range.
-        } else if (const VectorType *PackedTy = dyn_cast<VectorType>(AggTy)) {
+        } else if (const VectorType *VectorTy = dyn_cast<VectorType>(AggTy)) {
           // Getting an element of the packed vector.
-          if (Idx >= PackedTy->getNumElements()) return 0;  // Out of range.
+          if (Idx >= VectorTy->getNumElements()) return 0;  // Out of range.
 
-          // Merge in the packed type.
-          if (MergeInType(PackedTy, UsedType, TD)) return 0;
+          // Merge in the vector type.
+          if (MergeInType(VectorTy, UsedType, TD)) return 0;
           
           const Type *SubTy = CanConvertToScalar(GEP, IsNotTrivial);
           if (SubTy == 0) return 0;
@@ -640,8 +640,8 @@ void SROA::ConvertUsesToScalar(Value *Ptr, AllocaInst *NewAI, unsigned Offset) {
       Value *NV = new LoadInst(NewAI, LI->getName(), LI);
       if (NV->getType() != LI->getType()) {
         if (const VectorType *PTy = dyn_cast<VectorType>(NV->getType())) {
-          // If the result alloca is a packed type, this is either an element
-          // access or a bitcast to another packed type.
+          // If the result alloca is a vector type, this is either an element
+          // access or a bitcast to another vector type.
           if (isa<VectorType>(LI->getType())) {
             NV = new BitCastInst(NV, LI->getType(), LI->getName(), LI);
           } else {
@@ -703,8 +703,8 @@ void SROA::ConvertUsesToScalar(Value *Ptr, AllocaInst *NewAI, unsigned Offset) {
         Value *Old = new LoadInst(NewAI, NewAI->getName()+".in", SI);
         
         if (const VectorType *PTy = dyn_cast<VectorType>(AllocaType)) {
-          // If the result alloca is a packed type, this is either an element
-          // access or a bitcast to another packed type.
+          // If the result alloca is a vector type, this is either an element
+          // access or a bitcast to another vector type.
           if (isa<VectorType>(SV->getType())) {
             SV = new BitCastInst(SV, AllocaType, SV->getName(), SI);
           } else {