From 2521f36e5ddcadf8dc4bd9803c4ac74fc276f046 Mon Sep 17 00:00:00 2001
From: Aaron Ballman <aaron@aaronballman.com>
Date: Thu, 11 Dec 2014 19:35:42 +0000
Subject: 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'clang/lib/Sema/SemaChecking.cpp')

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());
-- 
cgit v1.2.3