updates based on pr comments

Author: spall

clang/lib/AST/ExprConstant.cpp

@@ -3849,7 +3849,7 @@ static bool handleScalarCast(EvalInfo &Info, const FPOptions FPO, const Expr *E,
                              : Info.Ctx.getIntTypeForBitwidth(64, false);
       Result = APValue(Info.Ctx.MakeIntValue(IntResult, IntType));
     }
-    if (DestTy->isFloatingType()) {
+    if (DestTy->isRealFloatingType()) {
       APValue Result2 = APValue(APFloat(0.0));
       if (!HandleIntToFloatCast(Info, E, FPO,
                                 Info.Ctx.getIntTypeForBitwidth(64, false),
@@ -4048,9 +4048,9 @@ static unsigned elementwiseSize(EvalInfo &Info, QualType BaseTy) {
     if (Type->isConstantArrayType()) {
       QualType ElTy = cast<ConstantArrayType>(Info.Ctx.getAsArrayType(Type))
                           ->getElementType();
-      uint64_t Size =
+      uint64_t ArrSize =
           cast<ConstantArrayType>(Info.Ctx.getAsArrayType(Type))->getZExtSize();
-      for (uint64_t I = 0; I < Size; ++I) {
+      for (uint64_t I = 0; I < ArrSize; ++I) {
         WorkList.push_back(ElTy);
       }
       continue;
@@ -11239,11 +11239,12 @@ bool RecordExprEvaluator::VisitCastExpr(const CastExpr *E) {
         return false;
     }
 
+    unsigned NEls = elementwiseSize(Info, E->getType());
     // flatten the source
     SmallVector<APValue> SrcEls;
     SmallVector<QualType> SrcTypes;
     if (!flattenAPValue(Info.Ctx, Val, SE->getType(), SrcEls, SrcTypes,
-                        UINT_MAX))
+                        NEls))
       return Error(E);
 
     // cast the elements and construct our struct result
@@ -13617,11 +13618,12 @@ bool ArrayExprEvaluator::VisitCastExpr(const CastExpr *E) {
         return false;
     }
 
+    unsigned NEls = elementwiseSize(Info, E->getType());
     // flatten the source
     SmallVector<APValue> SrcEls;
     SmallVector<QualType> SrcTypes;
     if (!flattenAPValue(Info.Ctx, Val, SE->getType(), SrcEls, SrcTypes,
-                        UINT_MAX))
+                        NEls))
       return Error(E);
 
     // cast the elements

clang/test/SemaHLSL/Types/AggregateSplatConstantExpr.hlsl

@@ -32,7 +32,6 @@ export void fn() {
   // splat from a vector of size 1
 
   constexpr float1 Y = {1.0};
-  constexpr int1 A1 = {1};
   constexpr float4 F4 = (float4)Y;
   _Static_assert(F4[0] == 1.0, "Woo!");
   _Static_assert(F4[1] == 1.0, "Woo!");
@@ -51,6 +50,7 @@ export void fn() {
   _Static_assert(B6[5] == 3, "Woo!");
 
   // splat from a vector of size 1
+  constexpr int1 A1 = {1};
   constexpr uint64_t2 A7[2] = (uint64_t2[2])A1;
   _Static_assert(A7[0][0] == 1, "Woo!");
   _Static_assert(A7[0][1] == 1, "Woo!");

clang/test/SemaHLSL/Types/ElementwiseCastConstantExpr.hlsl

@@ -38,7 +38,6 @@ export void fn() {
   // result type int
   // truncate from struct
   constexpr B1 SB1 = {1.0, 3.0};
-  constexpr float Blah = SB1.A;
   constexpr int X = (int)SB1;
   _Static_assert(X == 1, "Woo!");