Make diag::err_hlsl_adduint64_invalid_arguments more generic

- Renamed diag::err_hlsl_adduint64_invalid_arguments to diag::err_invalid_even_odd_vector_element_count
    - The error message is now along the lines of "invalid element count of X in vector initializer/operand (expected an even/odd element count in the range of Y and Z)"
    - Type is not included in the error message because another error handler already catches when an incorrect type is used

- Switch back to using diag::err_vec_builtin_non_vector to report an error when a scalar is passed to AddUint64 instead of a vector

Author: Icohedron

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -10624,6 +10624,8 @@ def err_second_argument_to_cwsc_not_pointer : Error<
 
 def err_vector_incorrect_num_elements : Error<
   "%select{too many|too few}0 elements in vector %select{initialization|operand}3 (expected %1 elements, have %2)">;
+def err_invalid_even_odd_vector_element_count : Error<
+  "invalid element count of %0 in vector %select{initialization|operand}4 (expected an %select{even|odd}3 element count in the range of %1 and %2)">;
 def err_altivec_empty_initializer : Error<"expected initializer">;
 
 def err_invalid_neon_type_code : Error<
@@ -12553,8 +12555,6 @@ def err_std_initializer_list_malformed : Error<
   "%0 layout not recognized. Must be a non-polymorphic class type with no bases and two fields: a 'const E *' and either another 'const E *' or a 'std::size_t'">;
 
 // HLSL Diagnostics
-def err_hlsl_adduint64_invalid_arguments: Error<
-  "%select{scalar provided to a vector operand|invalid number of elements in vector operand}0 (expected a uint vector of 2 or 4 elements)">;
 def err_hlsl_attr_unsupported_in_stage : Error<"attribute %0 is unsupported in '%1' shaders, requires %select{|one of the following: }2%3">;
 def err_hlsl_attr_invalid_type : Error<
    "attribute %0 only applies to a field or parameter of type '%1'">;

clang/lib/Sema/SemaHLSL.cpp

@@ -2242,17 +2242,16 @@ bool SemaHLSL::CheckBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {
     auto *VTy = TheCall->getArg(0)->getType()->getAs<VectorType>();
     if (!VTy) {
       SemaRef.Diag(TheCall->getBeginLoc(),
-                   diag::err_hlsl_adduint64_invalid_arguments)
-          << /*scalar provided to a vector operand*/ 0;
+                   diag::err_vec_builtin_non_vector) << "AddUint64" << /*all*/ 1;
       return true;
     }
 
     // ensure both args have 2 elements, or both args have 4 elements
     int NumElementsArg = VTy->getNumElements();
     if (NumElementsArg != 2 && NumElementsArg != 4) {
       SemaRef.Diag(TheCall->getBeginLoc(),
-                   diag::err_hlsl_adduint64_invalid_arguments)
-          << /*invalid number of elements in vector operand*/ 1;
+                   diag::err_invalid_even_odd_vector_element_count)
+          << NumElementsArg << 2 << 4 << /*even*/ 0 << /*operand*/ 1;
       return true;
     }
 

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

@@ -17,12 +17,12 @@ uint2 test_mismatched_arg_types(uint2 a, uint4 b) {
 
 uint2 test_bad_num_arg_elements(uint3 a, uint3 b) {
   return __builtin_hlsl_adduint64(a, b);
-  // expected-error@-1 {{invalid number of elements in vector operand (expected a uint vector of 2 or 4 elements}}
+  // expected-error@-1 {{invalid element count of 3 in vector operand (expected an even element count in the range of 2 and 4)}}
 }
 
 uint2 test_scalar_arg_type(uint a) {
   return __builtin_hlsl_adduint64(a, a);
-  // expected-error@-1 {{scalar provided to a vector operand (expected a uint vector of 2 or 4 elements)}}
+  // expected-error@-1 {{all arguments to AddUint64 must be vectors}}
 }
 
 uint2 test_signed_integer_args(int2 a, int2 b) {