address pr comments

Author: spall

clang/lib/CodeGen/CGExprAgg.cpp

@@ -500,8 +500,8 @@ static void EmitHLSLAggregateSplatCast(CodeGenFunction &CGF, Address DestVal,
   // ^^ Flattened accesses to DestVal we want to store into
   CGF.FlattenAccessAndType(DestVal, DestTy, StoreGEPList, DestTypes);
 
-  assert(SrcTy->isScalarType() && "Invalid HLSL splat cast.");
-  for (unsigned I = 0, Size = StoreGEPList.size(); I < Size; I++) {
+  assert(SrcTy->isScalarType() && "Invalid HLSL Aggregate splat cast.");
+  for (unsigned I = 0, Size = StoreGEPList.size(); I < Size; ++I) {
     llvm::Value *Cast =
         CGF.EmitScalarConversion(SrcVal, SrcTy, DestTypes[I], Loc);
 

clang/lib/Sema/SemaHLSL.cpp

@@ -2804,14 +2804,14 @@ bool SemaHLSL::ContainsBitField(QualType BaseTy) {
   return false;
 }
 
-// Can perform an HLSL splat cast if the Dest is an aggregate and the
+// Can perform an HLSL Aggregate splat cast if the Dest is an aggregate and the
 // Src is a scalar or a vector of length 1
 // Or if Dest is a vector and Src is a vector of length 1
-bool SemaHLSL::CanPerformSplatCast(Expr *Src, QualType DestTy) {
+bool SemaHLSL::CanPerformAggregateSplatCast(Expr *Src, QualType DestTy) {
 
   QualType SrcTy = Src->getType();
-  // Not a valid HLSL Splat cast if Dest is a scalar or if this is going to
-  // be a vector splat from a scalar.
+  // Not a valid HLSL Aggregate Splat cast if Dest is a scalar or if this is
+  // going to be a vector splat from a scalar.
   if ((SrcTy->isScalarType() && DestTy->isVectorType()) ||
       DestTy->isScalarType())
     return false;
@@ -2831,7 +2831,7 @@ bool SemaHLSL::CanPerformSplatCast(Expr *Src, QualType DestTy) {
   llvm::SmallVector<QualType> DestTypes;
   BuildFlattenedTypeList(DestTy, DestTypes);
 
-  for (unsigned I = 0, Size = DestTypes.size(); I < Size; I++) {
+  for (unsigned I = 0, Size = DestTypes.size(); I < Size; ++I) {
     if (DestTypes[I]->isUnionType())
       return false;
     if (!CanPerformScalarCast(SrcTy, DestTypes[I]))

clang/test/CodeGenHLSL/BasicFeatures/SplatCast.hlsl renamed to clang/test/CodeGenHLSL/BasicFeatures/AggregateSplatCast.hlsl

@@ -52,7 +52,7 @@ struct S {
   float Y;
 };
 
-// struct splats?
+// struct splats
 // CHECK-LABEL: define void {{.*}}call3
 // CHECK: [[A:%.*]] = alloca <1 x i32>, align 4
 // CHECK: [[s:%.*]] = alloca %struct.S, align 4