1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Analysis/AnalysisDeclContext.cpp b/clang/lib/Analysis/AnalysisDeclContext.cpp
index f72c75a..f209246 100644
--- a/clang/lib/Analysis/AnalysisDeclContext.cpp
+++ b/clang/lib/Analysis/AnalysisDeclContext.cpp
@@ -142,7 +142,7 @@ bool AnalysisDeclContext::isBodyAutosynthesizedFromModelFile() const {
 
 /// Returns true if \param VD is an Objective-C implicit 'self' parameter.
 static bool isSelfDecl(const VarDecl *VD) {
-  return isa_and_nonnull<ImplicitParamDecl>(VD) && VD->getName() == "self";
+  return isa<ImplicitParamDecl>(VD) && VD->getName() == "self";
 }
 
 const ImplicitParamDecl *AnalysisDeclContext::getSelfDecl() const {
@@ -169,8 +169,8 @@ const ImplicitParamDecl *AnalysisDeclContext::getSelfDecl() const {
     if (!LC.capturesVariable())
       continue;
 
-    ValueDecl *VD = LC.getCapturedVar();
-    if (isSelfDecl(dyn_cast<VarDecl>(VD)))
+    VarDecl *VD = LC.getCapturedVar();
+    if (isSelfDecl(VD))
       return dyn_cast<ImplicitParamDecl>(VD);
   }