diff options
Diffstat (limited to 'test/SemaObjC/nonnull.m')
| -rw-r--r-- | test/SemaObjC/nonnull.m | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/test/SemaObjC/nonnull.m b/test/SemaObjC/nonnull.m index a345eddbf1e4..cacca07240f6 100644 --- a/test/SemaObjC/nonnull.m +++ b/test/SemaObjC/nonnull.m @@ -31,16 +31,16 @@ foo (int i1, int i2, int i3, void (^cp1)(), void (^cp2)(), void (^cp3)()) { func1(cp1, cp2, i1); - 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(0, cp2, i1); // expected-warning {{null passed to a callee that requires a non-null argument}} + func1(cp1, 0, i1); // expected-warning {{null passed to a callee that requires a non-null argument}} func1(cp1, cp2, 0); - 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}} + func3(0, i2, cp3, i3); // expected-warning {{null passed to a callee that requires a non-null argument}} + func3(cp3, i2, 0, i3); // expected-warning {{null passed to a callee that requires a non-null argument}} - 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}} + func4(0, cp1); // expected-warning {{null passed to a callee that requires a non-null argument}} + func4(cp1, 0); // expected-warning {{null passed to a callee that requires a non-null argument}} // Shouldn't these emit warnings? Clang doesn't, and neither does GCC. It // seems that the checking should handle Objective-C pointers. @@ -64,7 +64,7 @@ __attribute__((nonnull)) void _dispatch_queue_push_list(dispatch_object_t _head); // no warning void func6(dispatch_object_t _head) { - _dispatch_queue_push_list(0); // expected-warning {{null passed to a callee which requires a non-null argument}} + _dispatch_queue_push_list(0); // expected-warning {{null passed to a callee that requires a non-null argument}} _dispatch_queue_push_list(_head._do); // no warning } @@ -91,10 +91,10 @@ extern void DoSomethingNotNull(void *db) __attribute__((nonnull(1))); @implementation IMP - (void) Meth { NSObject *object; - [object doSomethingWithNonNullPointer:NULL:1:NULL]; // expected-warning 2 {{null passed to a callee which requires a non-null argument}} - [object doSomethingWithNonNullPointer:vp:1:NULL]; // expected-warning {{null passed to a callee which requires a non-null argument}} - [NSObject doSomethingClassyWithNonNullPointer:NULL]; // expected-warning {{null passed to a callee which requires a non-null argument}} - DoSomethingNotNull(NULL); // expected-warning {{null passed to a callee which requires a non-null argument}} + [object doSomethingWithNonNullPointer:NULL:1:NULL]; // expected-warning 2 {{null passed to a callee that requires a non-null argument}} + [object doSomethingWithNonNullPointer:vp:1:NULL]; // expected-warning {{null passed to a callee that requires a non-null argument}} + [NSObject doSomethingClassyWithNonNullPointer:NULL]; // expected-warning {{null passed to a callee that requires a non-null argument}} + DoSomethingNotNull(NULL); // expected-warning {{null passed to a callee that requires a non-null argument}} [object doSomethingWithNonNullPointer:vp:1:vp]; } - (void*) testRetNull { @@ -111,15 +111,15 @@ __attribute__((objc_root_class)) @end void test(TestNonNullParameters *f) { - [f doNotPassNullParameter:0]; // expected-warning {{null passed to a callee which requires a non-null argument}} + [f doNotPassNullParameter:0]; // expected-warning {{null passed to a callee that requires a non-null argument}} [f doNotPassNullParameterArgIndex:0]; // no-warning - [f doNotPassNullOnMethod:0]; // expected-warning {{null passed to a callee which requires a non-null argument}} + [f doNotPassNullOnMethod:0]; // expected-warning {{null passed to a callee that requires a non-null argument}} } void PR18795(int (^g)(const char *h, ...) __attribute__((nonnull(1))) __attribute__((nonnull))) { - g(0); // expected-warning{{null passed to a callee which requires a non-null argument}} + g(0); // expected-warning{{null passed to a callee that requires a non-null argument}} } void PR18795_helper() { - PR18795(0); // expected-warning{{null passed to a callee which requires a non-null argument}} + PR18795(0); // expected-warning{{null passed to a callee that requires a non-null argument}} } |