Add a new sema diag message for AddUint64

Author: Icohedron

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -10623,7 +10623,7 @@ def err_second_argument_to_cwsc_not_pointer : Error<
   "second argument to __builtin_call_with_static_chain must be of pointer type">;
 
 def err_vector_incorrect_num_elements : Error<
-  "%select{too many|too few|incorrect number of}0 elements in vector %select{initialization|operand}3 (expected %1 elements, have %2)">;
+  "%select{too many|too few}0 elements in vector %select{initialization|operand}3 (expected %1 elements, have %2)">;
 def err_altivec_empty_initializer : Error<"expected initializer">;
 
 def err_invalid_neon_type_code : Error<
@@ -12553,6 +12553,8 @@ 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

@@ -2241,17 +2241,18 @@ bool SemaHLSL::CheckBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {
     // ensure both args are vectors
     auto *VTy = TheCall->getArg(0)->getType()->getAs<VectorType>();
     if (!VTy) {
-      SemaRef.Diag(TheCall->getBeginLoc(), diag::err_vec_builtin_non_vector)
-          << "AddUint64" << /*all*/ 1;
+      SemaRef.Diag(TheCall->getBeginLoc(),
+                   diag::err_hlsl_adduint64_invalid_arguments)
+          << /*scalar provided to a vector operand*/ 0;
       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_vector_incorrect_num_elements)
-          << 2 << "2 or 4" << NumElementsArg << /*operand*/ 1;
+                   diag::err_hlsl_adduint64_invalid_arguments)
+          << /*invalid number of elements in vector 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 {{incorrect number of elements in vector operand (expected 2 or 4 elements, have 3)}}
+  // expected-error@-1 {{invalid number of elements in vector operand (expected a uint vector of 2 or 4 elements}}
 }
 
 uint2 test_scalar_arg_type(uint a) {
   return __builtin_hlsl_adduint64(a, a);
-  // expected-error@-1 {{all arguments to AddUint64 must be vectors}}
+  // expected-error@-1 {{scalar provided to a vector operand (expected a uint vector of 2 or 4 elements)}}
 }
 
 uint2 test_signed_integer_args(int2 a, int2 b) {