Author: aaronballman Date: Mon Apr 18 13:10:53 2016 New Revision: 266644 URL: http://llvm.org/viewvc/llvm-project?rev=266644&view=rev Log: Clarifying the wording of this diagnostic; it confused parameter and argument.
Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td cfe/trunk/lib/Sema/SemaChecking.cpp cfe/trunk/test/Sema/varargs-x86-64.c cfe/trunk/test/Sema/varargs.c Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=266644&r1=266643&r2=266644&view=diff ============================================================================== --- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original) +++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Mon Apr 18 13:10:53 2016 @@ -7411,8 +7411,9 @@ def err_va_start_used_in_wrong_abi_funct "'va_start' used in %select{System V|Win64}0 ABI function">; def err_ms_va_start_used_in_sysv_function : Error< "'__builtin_ms_va_start' used in System V ABI function">; -def warn_second_parameter_of_va_start_not_last_named_argument : Warning< - "second parameter of 'va_start' not last named argument">, InGroup<Varargs>; +def warn_second_arg_of_va_start_not_last_named_param : Warning< + "second argument to 'va_start' is not the last named parameter">, + InGroup<Varargs>; def warn_va_start_of_reference_type_is_undefined : Warning< "'va_start' has undefined behavior with reference types">, InGroup<Varargs>; def err_first_argument_to_va_arg_not_of_type_va_list : Error< Modified: cfe/trunk/lib/Sema/SemaChecking.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaChecking.cpp?rev=266644&r1=266643&r2=266644&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaChecking.cpp (original) +++ cfe/trunk/lib/Sema/SemaChecking.cpp Mon Apr 18 13:10:53 2016 @@ -2723,7 +2723,7 @@ bool Sema::SemaBuiltinVAStartImpl(CallEx if (!SecondArgIsLastNamedArgument) Diag(TheCall->getArg(1)->getLocStart(), - diag::warn_second_parameter_of_va_start_not_last_named_argument); + diag::warn_second_arg_of_va_start_not_last_named_param); else if (Type->isReferenceType()) { Diag(Arg->getLocStart(), diag::warn_va_start_of_reference_type_is_undefined); Modified: cfe/trunk/test/Sema/varargs-x86-64.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/varargs-x86-64.c?rev=266644&r1=266643&r2=266644&view=diff ============================================================================== --- cfe/trunk/test/Sema/varargs-x86-64.c (original) +++ cfe/trunk/test/Sema/varargs-x86-64.c Mon Apr 18 13:10:53 2016 @@ -21,8 +21,8 @@ void __attribute__((ms_abi)) g1(int a) { void __attribute__((ms_abi)) g2(int a, int b, ...) { __builtin_ms_va_list ap; - __builtin_ms_va_start(ap, 10); // expected-warning {{second parameter of 'va_start' not last named argument}} - __builtin_ms_va_start(ap, a); // expected-warning {{second parameter of 'va_start' not last named argument}} + __builtin_ms_va_start(ap, 10); // expected-warning {{second argument to 'va_start' is not the last named parameter}} + __builtin_ms_va_start(ap, a); // expected-warning {{second argument to 'va_start' is not the last named parameter}} __builtin_ms_va_start(ap, b); } Modified: cfe/trunk/test/Sema/varargs.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/varargs.c?rev=266644&r1=266643&r2=266644&view=diff ============================================================================== --- cfe/trunk/test/Sema/varargs.c (original) +++ cfe/trunk/test/Sema/varargs.c Mon Apr 18 13:10:53 2016 @@ -4,7 +4,7 @@ void f1(int a) { __builtin_va_list ap; - + __builtin_va_start(ap, a, a); // expected-error {{too many arguments to function}} __builtin_va_start(ap, a); // expected-error {{'va_start' used in function with fixed args}} } @@ -12,16 +12,16 @@ void f1(int a) void f2(int a, int b, ...) { __builtin_va_list ap; - - __builtin_va_start(ap, 10); // expected-warning {{second parameter of 'va_start' not last named argument}} - __builtin_va_start(ap, a); // expected-warning {{second parameter of 'va_start' not last named argument}} + + __builtin_va_start(ap, 10); // expected-warning {{second argument to 'va_start' is not the last named parameter}} + __builtin_va_start(ap, a); // expected-warning {{second argument to 'va_start' is not the last named parameter}} __builtin_va_start(ap, b); } void f3(float a, ...) { __builtin_va_list ap; - + __builtin_va_start(ap, a); __builtin_va_start(ap, (a)); } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits