Remove unused local variables and private fields.

Author: mattmccutchen-cci

clang/include/clang/3C/AVarBoundsInfo.h

@@ -362,8 +362,7 @@ class AVarBoundsInfo {
 class ContextSensitiveBoundsKeyVisitor
     : public RecursiveASTVisitor<ContextSensitiveBoundsKeyVisitor> {
 public:
-  explicit ContextSensitiveBoundsKeyVisitor(ASTContext *C, ProgramInfo &I,
-                                            ConstraintResolver *CResolver);
+  explicit ContextSensitiveBoundsKeyVisitor(ASTContext *C, ProgramInfo &I);
 
   virtual ~ContextSensitiveBoundsKeyVisitor();
 
@@ -372,7 +371,6 @@ class ContextSensitiveBoundsKeyVisitor
 private:
   ASTContext *Context;
   ProgramInfo &Info;
-  ConstraintResolver *CR;
 };
 
 #endif // LLVM_CLANG_3C_AVARBOUNDSINFO_H

clang/include/clang/3C/RewriteUtils.h

@@ -193,14 +193,13 @@ class GlobalVariableGroups {
 // detected array variables.
 class ArrayBoundsRewriter {
 public:
-  ArrayBoundsRewriter(ASTContext *C, ProgramInfo &I) : Context(C), Info(I) {}
+  ArrayBoundsRewriter(ProgramInfo &I) : Info(I) {}
   // Get the string representation of the bounds for the given variable.
   std::string getBoundsString(PVConstraint *PV, Decl *D, bool Isitype = false);
   // Check if the constraint variable has newly created bounds string.
   bool hasNewBoundsString(PVConstraint *PV, Decl *D, bool Isitype = false);
 
 private:
-  ASTContext *Context;
   ProgramInfo &Info;
 };
 

clang/lib/3C/AVarBoundsInfo.cpp

@@ -898,7 +898,6 @@ bool AvarBoundsInference::inferBounds(BoundsKey K, AVarGraph &BKGraph,
         std::set<BoundsKey> PotentialB;
         PotentialB.clear();
         for (auto TK : PotBDs[K]) {
-          ProgramVar *TKVar = BI->getProgramVar(TK);
           getReachableBoundKeys(Kvar->getScope(), TK, PotentialB, BKGraph,
                                 true);
         }
@@ -1333,8 +1332,8 @@ bool AVarBoundsInfo::areSameProgramVar(BoundsKey B1, BoundsKey B2) {
 }
 
 ContextSensitiveBoundsKeyVisitor::ContextSensitiveBoundsKeyVisitor(
-    ASTContext *C, ProgramInfo &I, ConstraintResolver *CResolver)
-    : Context(C), Info(I), CR(CResolver) {
+    ASTContext *C, ProgramInfo &I)
+    : Context(C), Info(I) {
   Info.getABoundsInfo().resetContextSensitiveBoundsKey();
 }
 

clang/lib/3C/ArrayBoundsInferenceConsumer.cpp

@@ -613,7 +613,6 @@ bool LocalVarABVisitor::VisitArraySubscriptExpr(ArraySubscriptExpr *E) {
 
 bool LocalVarABVisitor::VisitDeclStmt(DeclStmt *S) {
   // Build rules based on initializers.
-  auto &ABoundsInfo = Info.getABoundsInfo();
   for (const auto &D : S->decls())
     if (VarDecl *VD = dyn_cast<VarDecl>(D)) {
       Expr *InitE = VD->getInit();

clang/lib/3C/ConstraintBuilder.cpp

@@ -546,7 +546,7 @@ void ConstraintBuilderConsumer::HandleTranslationUnit(ASTContext &C) {
   TypeVarVisitor TV = TypeVarVisitor(&C, Info);
   ConstraintResolver CSResolver(Info, &C);
   ContextSensitiveBoundsKeyVisitor CSBV =
-      ContextSensitiveBoundsKeyVisitor(&C, Info, &CSResolver);
+      ContextSensitiveBoundsKeyVisitor(&C, Info);
   ConstraintGenVisitor GV = ConstraintGenVisitor(&C, Info, TV);
   TranslationUnitDecl *TUD = C.getTranslationUnitDecl();
   // Generate constraints.

clang/lib/3C/DeclRewriter.cpp

@@ -30,7 +30,7 @@ using namespace clang;
 void DeclRewriter::rewriteDecls(ASTContext &Context, ProgramInfo &Info,
                                 Rewriter &R) {
   // Compute the bounds information for all the array variables.
-  ArrayBoundsRewriter ABRewriter(&Context, Info);
+  ArrayBoundsRewriter ABRewriter(Info);
 
   // Collect function and record declarations that need to be rewritten in a set
   // as well as their rewriten types in a map.