diff options
| -rw-r--r-- | lib/Sema/SemaDeclAttr.cpp | 4 | ||||
| -rw-r--r-- | test/SemaObjC/nonnull.m (renamed from test/Sema/nonnull.c) | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp index bdf6ca13a3..f5babc19be 100644 --- a/lib/Sema/SemaDeclAttr.cpp +++ b/lib/Sema/SemaDeclAttr.cpp @@ -352,7 +352,7 @@ static void HandleNonNullAttr(Decl *d, const AttributeList &Attr, Sema &S) { // Is the function argument a pointer type? QualType T = getFunctionOrMethodArgType(d, x); - if (!T->isPointerType() && !T->isBlockPointerType()) { + if (!T->isAnyPointerType() && !T->isBlockPointerType()) { // FIXME: Should also highlight argument in decl. S.Diag(Attr.getLoc(), diag::err_nonnull_pointers_only) << "nonnull" << Ex->getSourceRange(); @@ -367,7 +367,7 @@ static void HandleNonNullAttr(Decl *d, const AttributeList &Attr, Sema &S) { if (NonNullArgs.empty()) { for (unsigned I = 0, E = getFunctionOrMethodNumArgs(d); I != E; ++I) { QualType T = getFunctionOrMethodArgType(d, I); - if (T->isPointerType() || T->isBlockPointerType()) + if (T->isAnyPointerType() || T->isBlockPointerType()) NonNullArgs.push_back(I); } diff --git a/test/Sema/nonnull.c b/test/SemaObjC/nonnull.m index 3bed2feb50..869bbbd57e 100644 --- a/test/Sema/nonnull.c +++ b/test/SemaObjC/nonnull.m @@ -1,10 +1,15 @@ // RUN: clang-cc -fblocks -fsyntax-only -verify %s +@class NSObject; + int f1(int x) __attribute__((nonnull)); // expected-warning{{'nonnull' attribute applied to function with no pointer arguments}} int f2(int *x) __attribute__ ((nonnull (1))); int f3(int *x) __attribute__ ((nonnull (0))); // expected-error {{'nonnull' attribute parameter 1 is out of bounds}} int f4(int *x, int *y) __attribute__ ((nonnull (1,2))); int f5(int *x, int *y) __attribute__ ((nonnull (2,1))); +int f6(NSObject *x) __attribute__ ((nonnull (1))); // no-warning +int f7(NSObject *x) __attribute__ ((nonnull)); // no-warning + extern void func1 (void (^block1)(), void (^block2)(), int) __attribute__((nonnull)); @@ -29,4 +34,9 @@ foo (int i1, int i2, int i3, void (^cp1)(), void (^cp2)(), void (^cp3)()) 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}} + + // Shouldn't these emit warnings? Clang doesn't, and neither does GCC. It + // seems that the checking should handle Objective-C pointers. + func6((NSObject*) 0); // no-warning + func7((NSObject*) 0); // no-warning } |