fix issues introduced in self review

Author: spall

clang/lib/AST/ExprConstant.cpp

@@ -3843,13 +3843,15 @@ static bool handleScalarCast(EvalInfo &Info, const FPOptions FPO, const Expr *E,
       if (!HandleConversionToBool(Original, BoolResult))
         return false;
       uint64_t IntResult = BoolResult;
-      Result = APValue(Info.Ctx.MakeIntValue(
-          IntResult, Info.Ctx.getIntTypeForBitwidth(64, true)));
+      QualType IntType = DestTy->isIntegerType()
+                             ? DestTy
+                             : Info.Ctx.getIntTypeForBitwidth(64, false);
+      Result = APValue(Info.Ctx.MakeIntValue(IntResult, IntType));
     }
     if (DestTy->isFloatingType()) {
       APValue Result2 = APValue(APFloat(0.0));
       if (!HandleIntToFloatCast(Info, E, FPO,
-                                Info.Ctx.getIntTypeForBitwidth(64, true),
+                                Info.Ctx.getIntTypeForBitwidth(64, false),
                                 Result.getInt(), DestTy, Result2.getFloat()))
         return false;
       Result = Result2;

clang/test/SemaHLSL/Types/BuiltinVector/TruncationConstantExpr.hlsl

@@ -5,9 +5,7 @@
 // Note: these tests are a bit awkward because at time of writing we don't have a
 // good way to constexpr `any` for bool vector conditions, and the condition for
 // _Static_assert must be an integral constant.
-
 export void fn() {
-
   // This compiling successfully verifies that the vector constant expression
   // gets truncated to an integer at compile time for instantiation.
   _Static_assert(((int)1.xxxx) + 0 == 1, "Woo!");

clang/test/SemaHLSL/Types/ElementwiseCastConstantExpr.hlsl

@@ -27,7 +27,6 @@ struct B2 : B1 {
 };
 
 export void fn() {
-/*
   _Static_assert(((float4)(int[6]){1,2,3,4,5,6}).x == 1.0, "Woo!");
 
   // This compiling successfully verifies that the array constant expression
@@ -80,13 +79,13 @@ export void fn() {
   _Static_assert(SB.U[1] == 1000, "Woo!");
   _Static_assert(SB.I == 8, "Woo!");
   _Static_assert(SB.I2 == 0, "Woo!");
-*/
+
   // Make sure we read bitfields correctly
   constexpr Base BB = {222.22, {100, 200}, -2, 7};
-  constexpr int Arr[5] = (int[5])BB;
-  _Static_assert(Arr[0] == 222, "Woo!");
-  _Static_assert(Arr[1] == 100, "Woo!");
-  _Static_assert(Arr[2] == 200, "Woo!");
-  _Static_assert(Arr[3] == -2, "Woo!");
-  _Static_assert(Arr[4] == 7, "Woo!");
+  constexpr int Arr3[5] = (int[5])BB;
+  _Static_assert(Arr3[0] == 222, "Woo!");
+  _Static_assert(Arr3[1] == 100, "Woo!");
+  _Static_assert(Arr3[2] == 200, "Woo!");
+  _Static_assert(Arr3[3] == -2, "Woo!");
+  _Static_assert(Arr3[4] == 7, "Woo!");
 }