diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 3 | ||||
| -rw-r--r-- | clang/test/Sema/nonnull-check.c | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index bcf4774ca66..1c6c7f2e7cb 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -1624,7 +1624,8 @@ def warn_printf_invalid_conversion : Warning< def warn_printf_missing_format_string : Warning< "format string missing">, InGroup<Format>; def warn_null_arg : Warning< - "argument is null where non-null is required">, InGroup<NonNull>; + "null passed to a callee which requires a non-null argument">, + InGroup<NonNull>; def warn_printf_empty_format_string : Warning< "format string is empty">, InGroup<FormatZeroLength>; def warn_printf_format_string_is_wide_literal : Warning< diff --git a/clang/test/Sema/nonnull-check.c b/clang/test/Sema/nonnull-check.c index dc0928477e3..8454c7ca74c 100644 --- a/clang/test/Sema/nonnull-check.c +++ b/clang/test/Sema/nonnull-check.c @@ -13,14 +13,14 @@ foo (int i1, int i2, int i3, void (^cp1)(), void (^cp2)(), void (^cp3)()) { func1(cp1, cp2, i1); - func1(0, cp2, i1); // expected-warning {{argument is null where non-null is required}} - func1(cp1, 0, i1); // expected-warning {{argument is null where non-null is required}} + func1(0, cp2, i1); // expected-warning {{null passed to a callee which requires a non-null argument}} + func1(cp1, 0, i1); // expected-warning {{null passed to a callee which requires a non-null argument}} func1(cp1, cp2, 0); - func3(0, i2, cp3, i3); // expected-warning {{argument is null where non-null is required}} - func3(cp3, i2, 0, i3); // expected-warning {{argument is null where non-null is required}} + func3(0, i2, cp3, i3); // expected-warning {{null passed to a callee which requires a non-null argument}} + func3(cp3, i2, 0, i3); // expected-warning {{null passed to a callee which requires a non-null argument}} - func4(0, cp1); // expected-warning {{argument is null where non-null is required}} - func4(cp1, 0); // expected-warning {{argument is null where non-null is required}} + func4(0, cp1); // expected-warning {{null passed to a callee which requires a non-null argument}} + func4(cp1, 0); // expected-warning {{null passed to a callee which requires a non-null argument}} } |
