Address PR comments and rename some symbols

- Rename CheckUnsignedIntegerRepresentation to CheckUnsignedIntRepresentations to more closely match the name of existing functions (There is a function named CheckUnsignedIntRepresentation in the same file)
- Rename NumElementsArg1 to NumElementsArg since we are only checking one arg, with the assertion that the other arg has the same type
- Change diag message displayed when a scalar is passed as an argument. It now uses diag::err_vec_builtin_non_vector to say that AddUint64 expects all its arguments to be vectors
- Remove unintended include `#include "clang/Basic/DiagnosticParse.h"`

Author: Icohedron

clang/lib/Sema/SemaHLSL.cpp

@@ -21,7 +21,6 @@
 #include "clang/AST/Type.h"
 #include "clang/AST/TypeLoc.h"
 #include "clang/Basic/Builtins.h"
-#include "clang/Basic/DiagnosticParse.h"
 #include "clang/Basic/DiagnosticSema.h"
 #include "clang/Basic/IdentifierTable.h"
 #include "clang/Basic/LLVM.h"
@@ -2024,7 +2023,7 @@ static bool CheckAllArgsHaveFloatRepresentation(Sema *S, CallExpr *TheCall) {
                                     checkAllFloatTypes);
 }
 
-static bool CheckUnsignedIntegerRepresentation(Sema *S, CallExpr *TheCall) {
+static bool CheckUnsignedIntRepresentations(Sema *S, CallExpr *TheCall) {
   auto checkUnsignedInteger = [](clang::QualType PassedType) -> bool {
     clang::QualType BaseType =
         PassedType->isVectorType()
@@ -2232,7 +2231,7 @@ bool SemaHLSL::CheckBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {
       return true;
     if (CheckVectorElementCallArgs(&SemaRef, TheCall))
       return true;
-    if (CheckUnsignedIntegerRepresentation(&SemaRef, TheCall))
+    if (CheckUnsignedIntRepresentations(&SemaRef, TheCall))
       return true;
 
     // CheckVectorElementCallArgs(...) guarantees both args are the same type.
@@ -2242,18 +2241,17 @@ 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_vector_incorrect_num_elements)
-          << 2 << "2 or 4" << 1 << /*operand*/ 1;
+      SemaRef.Diag(TheCall->getBeginLoc(), diag::err_vec_builtin_non_vector)
+          << "AddUint64" << /*all*/ 1;
       return true;
     }
 
     // ensure both args have 2 elements, or both args have 4 elements
-    int NumElementsArg1 = VTy->getNumElements();
-    if (NumElementsArg1 != 2 && NumElementsArg1 != 4) {
+    int NumElementsArg = VTy->getNumElements();
+    if (NumElementsArg != 2 && NumElementsArg != 4) {
       SemaRef.Diag(TheCall->getBeginLoc(),
                    diag::err_vector_incorrect_num_elements)
-          << 2 << "2 or 4" << NumElementsArg1 << /*operand*/ 1;
+          << 2 << "2 or 4" << NumElementsArg << /*operand*/ 1;
       return true;
     }
 

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

@@ -15,19 +15,14 @@ uint2 test_mismatched_arg_types(uint2 a, uint4 b) {
   // expected-error@-1 {{all arguments to '__builtin_hlsl_adduint64' must have the same type}}
 }
 
-uint2 test_too_many_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)}}
-}
-
-uint4 test_too_few_arg_elements(uint3 a, uint3 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)}}
 }
 
 uint2 test_scalar_arg_type(uint a) {
   return __builtin_hlsl_adduint64(a, a);
-  // expected-error@-1 {{incorrect number of elements in vector operand (expected 2 or 4 elements, have 1)}}
+  // expected-error@-1 {{all arguments to AddUint64 must be vectors}}
 }
 
 uint2 test_signed_integer_args(int2 a, int2 b) {