[checked-c-convert] Silence compile-time warnings and clean-up code (#671)

Author: Mandeep Singh Grang

tools/checked-c-convert/ArrayBoundsInferenceConsumer.cpp

@@ -117,12 +117,10 @@ void HandleArrayVariablesBoundsDetection(ASTContext *C, ProgramInfo &I) {
   LocalVarABVisitor LVAB(C, I);
   TranslationUnitDecl *TUD = C->getTranslationUnitDecl();
   for (const auto &D : TUD->decls()) {
-    if (dyn_cast<FunctionDecl>(D)) {
-      FunctionDecl *fb = dyn_cast<FunctionDecl>(D);
 #ifdef DEBUG
-      llvm::dbgs() << "Analyzing function:" << fb->getName() << "\n";
+    if (auto *FB = dyn_cast<FunctionDecl>(D))
+      llvm::dbgs() << "Analyzing function:" << FB->getName() << "\n";
 #endif
-    }
     LVAB.TraverseDecl(D);
   }
-}
+}

tools/checked-c-convert/ConstraintBuilder.cpp

@@ -451,7 +451,7 @@ class FunctionVisitor : public RecursiveASTVisitor<FunctionVisitor> {
 
         i++;
       }
-    } else if (DeclaratorDecl *DD = dyn_cast<DeclaratorDecl>(D))
+    } else if (isa<DeclaratorDecl>(D))
       handleFunctionPointerCall(E);
     else
       // Constrain all arguments to wild.

tools/checked-c-convert/ConstraintVariables.cpp

@@ -58,7 +58,7 @@ PointerVariableConstraint::PointerVariableConstraint(const QualType &QT, Constra
   if (InteropTypeExpr *ITE = D->getInteropTypeExpr()) {
     // External variables can also have itype. So, check if the provided
     // declaration is an external variable.
-    if (dyn_cast<VarDecl>(D) && dyn_cast<VarDecl>(D)->isExternC()) {
+    if (isa<VarDecl>(D) && cast<VarDecl>(D)->isExternC()) {
       QualType InteropType = C.getInteropTypeAndAdjust(ITE, false);
       // TODO: handle array_ptr types.
       if (InteropType->isCheckedPointerPtrType()) {

tools/checked-c-convert/Constraints.cpp

@@ -166,7 +166,7 @@ bool Constraints::canAssignConst(VarAtom *src) {
     // of the provided type.
     if (Not *N = dyn_cast<Not>(C))
       if (Eq *E = dyn_cast<Eq>(N->getBody()))
-        if (dyn_cast<T>(E->getRHS()))
+        if (isa<T>(E->getRHS()))
           return false;
   }
   return true;

tools/checked-c-convert/ProgramInfo.cpp

@@ -795,7 +795,7 @@ ProgramInfo::getVariable(clang::Decl *D, clang::ASTContext *C, bool inFunctionCo
 
   // if this a function declaration
   // set in context to false.
-  if (dyn_cast<FunctionDecl>(D))
+  if (isa<FunctionDecl>(D))
     inFunctionContext = false;
 
   return getVariableOnDemand(D, C, inFunctionContext);
@@ -811,16 +811,16 @@ ProgramInfo::getVariableOnDemand(Decl *D, ASTContext *C, bool inFunctionContext)
     // variable, or return value then we should see if we're looking this
     // up in the context of a function or not. If we are not, then we
     // should find a declaration
-    ParmVarDecl *PD = nullptr;
     FunctionDecl *funcDefinition = nullptr;
     FunctionDecl *funcDeclaration = nullptr;
     // get the function declaration and definition
-    if (D != nullptr && dyn_cast<FunctionDecl>(D)) {
-      funcDeclaration = getDeclaration(dyn_cast<FunctionDecl>(D));
-      funcDefinition = getDefinition(dyn_cast<FunctionDecl>(D));
+    if (D != nullptr && isa<FunctionDecl>(D)) {
+      auto *FDecl = cast<FunctionDecl>(D);
+      funcDeclaration = getDeclaration(FDecl);
+      funcDefinition = getDefinition(FDecl);
     }
     int parameterIndex = -1;
-    if (PD = dyn_cast<ParmVarDecl>(D)) {
+    if (auto *PD = dyn_cast<ParmVarDecl>(D)) {
       // okay, we got a request for a parameter
       DeclContext *DC = PD->getParentFunctionOrMethod();
       assert(DC != nullptr);