Revert r326602, it caused PR36620.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@326862 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 3 insertions, 4 deletions

diff --git a/lib/StaticAnalyzer/Checkers/NonNullParamChecker.cpp b/lib/StaticAnalyzer/Checkers/NonNullParamChecker.cpp
index 6f27995590..6d05159e51 100644
--- a/lib/StaticAnalyzer/Checkers/NonNullParamChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/NonNullParamChecker.cpp
@@ -58,11 +58,10 @@ void NonNullParamChecker::checkPreCall(const CallEvent &Call,
       AttrNonNull.set(0, NumArgs);
       break;
     }
-    for (const ParamIdx &Idx : NonNull->args()) {
-      unsigned IdxAST = Idx.getASTIndex();
-      if (IdxAST >= NumArgs)
+    for (unsigned Val : NonNull->args()) {
+      if (Val >= NumArgs)
         continue;
-      AttrNonNull.set(IdxAST);
+      AttrNonNull.set(Val);
     }
   }