Report name of function called in source

Icohedron · Icohedron · commit 7714dc568605 · 2025-02-14T22:31:14.000Z
diff --git a/clang/lib/Sema/SemaHLSL.cpp b/clang/lib/Sema/SemaHLSL.cpp
@@ -2257,7 +2257,7 @@ bool SemaHLSL::CheckBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {
     auto *VTy = TheCall->getArg(0)->getType()->getAs<VectorType>();
     if (!VTy) {
       SemaRef.Diag(TheCall->getBeginLoc(), diag::err_vec_builtin_non_vector)
-          << "AddUint64" << /*all*/ 1;
+          << TheCall->getDirectCallee() << /*all*/ 1;
       return true;
     }
 
diff --git a/clang/test/SemaHLSL/BuiltIns/AddUint64-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/AddUint64-errors.hlsl
@@ -22,7 +22,7 @@ uint2 test_bad_num_arg_elements(uint3 a, uint3 b) {
 
 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 {{all arguments to '__builtin_hlsl_adduint64' must be vectors}}
 }
 
 uint2 test_signed_integer_args(int2 a, int2 b) {

Original file line number	Diff line number	Diff line change
`@@ -2257,7 +2257,7 @@ bool SemaHLSL::CheckBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {`
`2257`	`2257`	`auto *VTy = TheCall->getArg(0)->getType()->getAs<VectorType>();`
`2258`	`2258`	`if (!VTy) {`
`2259`	`2259`	`SemaRef.Diag(TheCall->getBeginLoc(), diag::err_vec_builtin_non_vector)`
`2260`		`- << "AddUint64" << /all/ 1;`
	`2260`	`+ << TheCall->getDirectCallee() << /all/ 1;`
`2261`	`2261`	`return true;`
`2262`	`2262`	`}`
`2263`	`2263`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ uint2 test_bad_num_arg_elements(uint3 a, uint3 b) {`
`22`	`22`
`23`	`23`	`uint2 test_scalar_arg_type(uint a) {`
`24`	`24`	`return __builtin_hlsl_adduint64(a, a);`
`25`		`- // expected-error@-1 {{all arguments to AddUint64 must be vectors}}`
	`25`	`+ // expected-error@-1 {{all arguments to '__builtin_hlsl_adduint64' must be vectors}}`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`uint2 test_signed_integer_args(int2 a, int2 b) {`