address pr comments

Author: farzonl

clang/include/clang/Sema/Sema.h

@@ -14147,7 +14147,7 @@ class Sema final {
   bool SemaBuiltinVectorToScalarMath(CallExpr *TheCall);
   bool SemaBuiltinElementwiseMath(CallExpr *TheCall);
   bool SemaBuiltinElementwiseTernaryMath(CallExpr *TheCall,
-                                         bool enforceFloatingPointCheck = true);
+                                         bool CheckForFloatArgs = true);
   bool PrepareBuiltinElementwiseMathOneArgCall(CallExpr *TheCall);
   bool PrepareBuiltinReduceMathOneArgCall(CallExpr *TheCall);
 

clang/lib/Sema/SemaChecking.cpp

@@ -5303,7 +5303,7 @@ bool Sema::CheckHLSLBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {
       return true;
     if (CheckVectorElementCallArgs(this, TheCall))
       return true;
-    if (SemaBuiltinElementwiseTernaryMath(TheCall, false))
+    if (SemaBuiltinElementwiseTernaryMath(TheCall, /*CheckForFloatArgs*/ false))
       return true;
   }
   }
@@ -19809,7 +19809,7 @@ bool Sema::SemaBuiltinVectorMath(CallExpr *TheCall, QualType &Res) {
 }
 
 bool Sema::SemaBuiltinElementwiseTernaryMath(CallExpr *TheCall,
-                                             bool enforceFloatingPointCheck) {
+                                             bool CheckForFloatArgs) {
   if (checkArgCount(*this, TheCall, 3))
     return true;
 
@@ -19821,13 +19821,20 @@ bool Sema::SemaBuiltinElementwiseTernaryMath(CallExpr *TheCall,
     Args[I] = Converted.get();
   }
 
-  if (enforceFloatingPointCheck) {
+  if (CheckForFloatArgs) {
     int ArgOrdinal = 1;
     for (Expr *Arg : Args) {
       if (checkFPMathBuiltinElementType(*this, Arg->getBeginLoc(),
                                         Arg->getType(), ArgOrdinal++))
         return true;
     }
+  } else {
+    int ArgOrdinal = 1;
+    for (Expr *Arg : Args) {
+      if (checkMathBuiltinElementType(*this, Arg->getBeginLoc(), Arg->getType(),
+                                      ArgOrdinal++))
+        return true;
+    }
   }
 
   for (int I = 1; I < 3; ++I) {

clang/test/CodeGenHLSL/builtins/mad.hlsl

@@ -189,9 +189,3 @@ float2 test_mad_float2_int_splat(float2 p0, float2 p1, int p2) {
 float3 test_mad_float3_int_splat(float3 p0, float3 p1, int p2) {
   return mad(p0, p1, p2);
 }
-
-// CHECK: %dx.umad = call i1 @llvm.dx.umad.i1(i1 %tobool, i1 %tobool1, i1 %tobool2)
-// CHECK: ret i1 %dx.umad
-bool test_builtin_mad_bool_type_promotion(bool p0) {
-  return __builtin_hlsl_mad(p0, p0, p0);
-}

clang/test/SemaHLSL/BuiltIns/mad-errors.hlsl

@@ -72,12 +72,12 @@ float2 test_builtin_mad_int_vect_to_float_vec_promotion(int2 p0, float p1) {
 
 float builtin_bool_to_float_type_promotion(float p0, bool p1) {
   return __builtin_hlsl_mad(p0, p0, p1);
-  // expected-error@-1 {{arguments are of different types ('double' vs 'bool')}}
+  // expected-error@-1 {{3rd argument must be a vector, integer or floating point type (was 'bool')}}
 }
 
 float builtin_bool_to_float_type_promotion2(bool p0, float p1) {
   return __builtin_hlsl_mad(p1, p0, p1);
-  // expected-error@-1 {{arguments are of different types ('double' vs 'bool')}}
+  // expected-error@-1 {{2nd argument must be a vector, integer or floating point type (was 'bool')}}
 }
 
 float builtin_mad_int_to_float_promotion(float p0, int p1) {