commit 2521f36e5ddcadf8dc4bd9803c4ac74fc276f046
author Aaron Ballman <aaron@aaronballman.com> Thu Dec 11 19:35:42 2014 +0000
committer Aaron Ballman <aaron@aaronballman.com> Thu Dec 11 19:35:42 2014 +0000
tree f084494154ac1b68b18f8423efcc549b13838502
parent d919698caaa57cc8ed9667f75cf3bee7b1779f0e

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

clang/lib/Sema/SemaChecking.cpp

diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
index 8e55925..57fc14e 100644
--- a/clang/lib/Sema/SemaChecking.cpp
+++ b/clang/lib/Sema/SemaChecking.cpp
@@ -6766,7 +6766,8 @@
         }
         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());