diff options
| author | Aaron Ballman <aaron@aaronballman.com> | 2014-12-11 19:35:42 +0000 |
|---|---|---|
| committer | Aaron Ballman <aaron@aaronballman.com> | 2014-12-11 19:35:42 +0000 |
| commit | 2521f36e5ddcadf8dc4bd9803c4ac74fc276f046 (patch) | |
| tree | f084494154ac1b68b18f8423efcc549b13838502 /clang/lib/Sema | |
| parent | d919698caaa57cc8ed9667f75cf3bee7b1779f0e (diff) | |
| download | bcm5719-llvm-2521f36e5ddcadf8dc4bd9803c4ac74fc276f046.tar.gz bcm5719-llvm-2521f36e5ddcadf8dc4bd9803c4ac74fc276f046.zip | |
When checking for nonnull parameter attributes, also check the ParmVarDecl since the attribute may reside there, instead of just on the FunctionDecl. Fixes PR21668.
llvm-svn: 224039
Diffstat (limited to 'clang/lib/Sema')
| -rw-r--r-- | clang/lib/Sema/SemaChecking.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 2 |
2 files changed, 3 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)) |
