Author: Hood Chatham Date: 2025-05-13T13:01:28-07:00 New Revision: 3b3adefd58826ca4dfd87df8099766d416c54341
URL: https://github.com/llvm/llvm-project/commit/3b3adefd58826ca4dfd87df8099766d416c54341 DIFF: https://github.com/llvm/llvm-project/commit/3b3adefd58826ca4dfd87df8099766d416c54341.diff LOG: [Clang] Fix Sema::checkArgCount for 0-arg functions (#139638) When calling a function that expects zero arguments with one argument, `Call->getArg(1)` will trap when trying to format the diagnostic. This also seems to improve the rendering of the diagnostic some of the time. Before: ``` $ ./bin/clang -c a.c a.c:2:30: error: too many arguments to function call, expected 2, have 4 2 | __builtin_annotation(1, 2, 3, 4); | ~ ^ ``` After: ``` $ ./bin/clang -c a.c a.c:2:30: error: too many arguments to function call, expected 2, have 4 2 | __builtin_annotation(1, 2, 3, 4); | ^~~~ ``` Split from #139580. --------- Co-authored-by: Mariya Podchishchaeva <mariya.podchishcha...@intel.com> Added: Modified: clang/lib/Sema/SemaChecking.cpp clang/lib/Sema/SemaWasm.cpp clang/test/Sema/builtins-wasm.c Removed: ################################################################################ diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp index 59eb6d16f482c..55121b90fa167 100644 --- a/clang/lib/Sema/SemaChecking.cpp +++ b/clang/lib/Sema/SemaChecking.cpp @@ -168,7 +168,7 @@ bool Sema::checkArgCount(CallExpr *Call, unsigned DesiredArgCount) { return Diag(Range.getBegin(), diag::err_typecheck_call_too_many_args) << 0 /*function call*/ << DesiredArgCount << ArgCount - << /*is non object*/ 0 << Call->getArg(1)->getSourceRange(); + << /*is non object*/ 0 << Range; } static bool checkBuiltinVerboseTrap(CallExpr *Call, Sema &S) { diff --git a/clang/lib/Sema/SemaWasm.cpp b/clang/lib/Sema/SemaWasm.cpp index c0fa05bc17609..3362e1d717a6c 100644 --- a/clang/lib/Sema/SemaWasm.cpp +++ b/clang/lib/Sema/SemaWasm.cpp @@ -52,7 +52,7 @@ static bool CheckWasmBuiltinArgIsInteger(Sema &S, CallExpr *E, } bool SemaWasm::BuiltinWasmRefNullExtern(CallExpr *TheCall) { - if (TheCall->getNumArgs() != 0) + if (SemaRef.checkArgCount(TheCall, /*DesiredArgCount=*/0)) return true; TheCall->setType(getASTContext().getWebAssemblyExternrefType()); @@ -62,12 +62,8 @@ bool SemaWasm::BuiltinWasmRefNullExtern(CallExpr *TheCall) { bool SemaWasm::BuiltinWasmRefNullFunc(CallExpr *TheCall) { ASTContext &Context = getASTContext(); - if (TheCall->getNumArgs() != 0) { - Diag(TheCall->getBeginLoc(), diag::err_typecheck_call_too_many_args) - << 0 /*function call*/ << /*expected*/ 0 << TheCall->getNumArgs() - << /*is non object*/ 0; + if (SemaRef.checkArgCount(TheCall, /*DesiredArgCount=*/0)) return true; - } // This custom type checking code ensures that the nodes are as expected // in order to later on generate the necessary builtin. diff --git a/clang/test/Sema/builtins-wasm.c b/clang/test/Sema/builtins-wasm.c index beb430616233a..1aae365c95aff 100644 --- a/clang/test/Sema/builtins-wasm.c +++ b/clang/test/Sema/builtins-wasm.c @@ -7,6 +7,7 @@ static __externref_t table[0]; typedef void (*__funcref funcref_t)(); void test_ref_null() { funcref_t func = __builtin_wasm_ref_null_func(0); // expected-error {{too many arguments to function call, expected 0, have 1}} + __externref_t ref = __builtin_wasm_ref_null_extern(0); // expected-error {{too many arguments to function call, expected 0, have 1}} } void test_table_size(__externref_t ref, void *ptr, int arr[]) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
