commit f0ae7d02012af9c997c62a5b1bd04e57bf85530b
author Ted Kremenek <kremenek@apple.com> Fri Jan 17 07:15:35 2014 +0000
committer Ted Kremenek <kremenek@apple.com> Fri Jan 17 07:15:35 2014 +0000
tree b827f952046434827c64deab63edf7dd1f7dc34f
parent 2ff160046b6681976499619b9b8edc5bb6fb0e9c

[analyzer] Teach NonNullParamChecker about 'nonnull' attributes on parameters.

llvm-svn: 199473

clang/lib/StaticAnalyzer/Checkers/NonNullParamChecker.cpp

diff --git a/clang/lib/StaticAnalyzer/Checkers/NonNullParamChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/NonNullParamChecker.cpp
index 273a7a3..bde9027 100644
--- a/clang/lib/StaticAnalyzer/Checkers/NonNullParamChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/NonNullParamChecker.cpp
@@ -43,7 +43,7 @@
 } // end anonymous namespace
 
 void NonNullParamChecker::checkPreCall(const CallEvent &Call,
-                                      CheckerContext &C) const {
+                                       CheckerContext &C) const {
   const Decl *FD = Call.getDecl();
   if (!FD)
     return;
@@ -66,6 +66,12 @@
     }
 
     bool haveAttrNonNull = Att && Att->isNonNull(idx);
+    if (!haveAttrNonNull) {
+      // Check if the parameter is also marked 'nonnull'.
+      ArrayRef<ParmVarDecl*> parms = Call.parameters();
+      if (idx < parms.size())
+        haveAttrNonNull = parms[idx]->hasAttr<NonNullAttr>();
+    }
 
     if (!haveRefTypeParam && !haveAttrNonNull)
       continue;