diff options
| -rw-r--r-- | clang/lib/Sema/SemaChecking.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Sema/nonnull.c | 12 |
3 files changed, 15 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp index 8e5592564f5..57fc14e786c 100644 --- a/clang/lib/Sema/SemaChecking.cpp +++ b/clang/lib/Sema/SemaChecking.cpp @@ -6766,7 +6766,8 @@ void Sema::DiagnoseAlwaysNonNullPointer(Expr *E, } if (!AttrNonNull.empty()) for (unsigned i = 0; i < NumArgs; ++i) - if (FD->getParamDecl(i) == PV && AttrNonNull[i]) { + if (FD->getParamDecl(i) == PV && + (AttrNonNull[i] || PV->hasAttr<NonNullAttr>())) { std::string Str; llvm::raw_string_ostream S(Str); E->printPretty(S, nullptr, getPrintingPolicy()); diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 76e36123274..c04b99d464c 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -9243,7 +9243,7 @@ static void RecordModifiableNonNullParam(Sema &S, const Expr *Exp) { if (!Param) return; if (const FunctionDecl* FD = dyn_cast<FunctionDecl>(Param->getDeclContext())) - if (!FD->hasAttr<NonNullAttr>()) + if (!FD->hasAttr<NonNullAttr>() && !Param->hasAttr<NonNullAttr>()) return; if (FunctionScopeInfo *FD = S.getCurFunction()) if (!FD->ModifiedNonNullParams.count(Param)) diff --git a/clang/test/Sema/nonnull.c b/clang/test/Sema/nonnull.c index de47e9664ca..4b3df8518cf 100644 --- a/clang/test/Sema/nonnull.c +++ b/clang/test/Sema/nonnull.c @@ -141,3 +141,15 @@ void yet_another_evil_nonnull_func(int* pointer) } } +void pr21668_1(__attribute__((nonnull)) const char *p, const char *s) { + if (p) // expected-warning {{nonnull parameter 'p' will evaluate to 'true' on first encounter}} + ; + if (s) // No warning + ; +} + +void pr21668_2(__attribute__((nonnull)) const char *p) { + p = 0; + if (p) // No warning + ; +} |
