Use CheckScalarOrVector for better diagnostics

Author: Icohedron

clang/lib/Sema/SemaHLSL.cpp

@@ -2250,20 +2250,8 @@ bool SemaHLSL::CheckBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {
       return true;
     if (CheckVectorElementCallArgs(&SemaRef, TheCall))
       return true;
-
-    // check that the arguments are bools or, if vectors,
-    // vectors of bools
-    QualType ArgTy = TheCall->getArg(0)->getType();
-    if (const auto *VecTy = ArgTy->getAs<VectorType>()) {
-      ArgTy = VecTy->getElementType();
-    }
-    if (!getASTContext().hasSameUnqualifiedType(ArgTy,
-                                                getASTContext().BoolTy)) {
-      SemaRef.Diag(TheCall->getBeginLoc(),
-                   diag::err_typecheck_convert_incompatible)
-          << ArgTy << getASTContext().BoolTy << 1 << 0 << 0;
+    if (CheckScalarOrVector(&SemaRef, TheCall, getASTContext().BoolTy, 0))
       return true;
-    }
 
     ExprResult A = TheCall->getArg(0);
     QualType ArgTyA = A.get()->getType();

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

@@ -17,11 +17,7 @@ bool2 test_mismatched_args(bool2 a, bool3 b) {
   // expected-error@-1 {{all arguments to '__builtin_hlsl_and' must have the same type}}
 }
 
-struct S {
-  bool a;
-};
-
-bool test_invalid_type_conversion(S s) {
-  return __builtin_hlsl_and(s, s);
-  // expected-error@-1{{passing 'S' to parameter of incompatible type 'bool'}}
+bool test_incorrect_type(int a) {
+  return __builtin_hlsl_and(a, a);
+  // expected-error@-1{{invalid operand of type 'int' where 'bool' or a vector of such type is required}}
 }