refactoing: cleanup some dead code

Author: john-h-kastner

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

@@ -229,19 +229,17 @@ class AVarBoundsInfo {
   // Generate a random bounds key to be used for inference.
   BoundsKey getRandomBKey();
 
-  // Add Assignments between variables. These methods will add edges between
-  // corresponding BoundsKeys
-  bool addAssignment(clang::Decl *L, clang::Decl *R);
-  bool addAssignment(clang::DeclRefExpr *L, clang::DeclRefExpr *R);
-  bool addAssignment(BoundsKey L, BoundsKey R);
-  bool handlePointerAssignment(clang::Expr *L, clang::Expr *R, ASTContext *C,
+  // Add Assignments between variables. This method will add edges between the
+  // BoundsKeys.
+  void addAssignment(BoundsKey L, BoundsKey R);
+  void handlePointerAssignment(clang::Expr *L, clang::Expr *R,
                                ConstraintResolver *CR);
-  bool handleAssignment(clang::Expr *L, const CVarSet &LCVars,
+  void handleAssignment(clang::Expr *L, const CVarSet &LCVars,
                         const std::set<BoundsKey> &CSLKeys, clang::Expr *R,
                         const CVarSet &RCVars,
                         const std::set<BoundsKey> &CSRKeys, ASTContext *C,
                         ConstraintResolver *CR);
-  bool handleAssignment(clang::Decl *L, CVarOption LCVar, clang::Expr *R,
+  void handleAssignment(clang::Decl *L, CVarOption LCVar, clang::Expr *R,
                         const CVarSet &RCVars,
                         const std::set<BoundsKey> &CSRKeys, ASTContext *C,
                         ConstraintResolver *CR);

clang/include/clang/3C/CtxSensAVarBounds.h

@@ -67,7 +67,7 @@ class CtxSensitiveBoundsKeyHandler {
   BoundsKey getCtxSensCEBoundsKey(const PersistentSourceLoc &PSL, BoundsKey BK);
 
   // Handle context sensitive assignment (from R to L) to a variable.
-  bool handleContextSensitiveAssignment(const PersistentSourceLoc &PSL,
+  void handleContextSensitiveAssignment(const PersistentSourceLoc &PSL,
                                         clang::Decl *L,
                                         ConstraintVariable *LCVar,
                                         clang::Expr *R, CVarSet &RCVars,

clang/lib/3C/AVarBoundsInfo.cpp

@@ -888,25 +888,11 @@ BoundsKey AVarBoundsInfo::getRandomBKey() {
   return Ret;
 }
 
-bool AVarBoundsInfo::addAssignment(clang::Decl *L, clang::Decl *R) {
-  BoundsKey BL, BR;
-  if (tryGetVariable(L, BL) && tryGetVariable(R, BR)) {
-    return addAssignment(BL, BR);
-  }
-  return false;
-}
-
-bool AVarBoundsInfo::addAssignment(clang::DeclRefExpr *L,
-                                   clang::DeclRefExpr *R) {
-  return addAssignment(L->getDecl(), R->getDecl());
-}
-
-bool AVarBoundsInfo::handleAssignment(clang::Expr *L, const CVarSet &LCVars,
+void AVarBoundsInfo::handleAssignment(clang::Expr *L, const CVarSet &LCVars,
                                       const std::set<BoundsKey> &CSLKeys,
                                       clang::Expr *R, const CVarSet &RCVars,
                                       const std::set<BoundsKey> &CSRKeys,
                                       ASTContext *C, ConstraintResolver *CR) {
-  bool Ret = false;
   BoundsKey TmpK;
   std::set<BoundsKey> AllLKeys = CSLKeys;
   std::set<BoundsKey> AllRKeys = CSRKeys;
@@ -921,32 +907,29 @@ bool AVarBoundsInfo::handleAssignment(clang::Expr *L, const CVarSet &LCVars,
 
   for (auto LK : AllLKeys) {
     for (auto RK : AllRKeys) {
-      Ret = addAssignment(LK, RK) || Ret;
+      addAssignment(LK, RK);
     }
   }
-  return Ret;
 }
 
-bool AVarBoundsInfo::handleAssignment(clang::Decl *L, CVarOption LCVars,
+void AVarBoundsInfo::handleAssignment(clang::Decl *L, CVarOption LCVars,
                                       clang::Expr *R, const CVarSet &RCVars,
                                       const std::set<BoundsKey> &CSRKeys,
                                       ASTContext *C, ConstraintResolver *CR) {
   BoundsKey LKey, RKey;
-  bool Ret = false;
   if (CR->resolveBoundsKey(LCVars, LKey) || tryGetVariable(L, LKey)) {
     std::set<BoundsKey> AllRKeys = CSRKeys;
     if (AllRKeys.empty() &&
         (CR->resolveBoundsKey(RCVars, RKey) || tryGetVariable(R, *C, RKey))) {
       AllRKeys.insert(RKey);
     }
     for (auto RK : AllRKeys) {
-      Ret = addAssignment(LKey, RK) || Ret;
+      addAssignment(LKey, RK);
     }
   }
-  return Ret;
 }
 
-bool AVarBoundsInfo::addAssignment(BoundsKey L, BoundsKey R) {
+void AVarBoundsInfo::addAssignment(BoundsKey L, BoundsKey R) {
   // Before adding an edge from L to R or R to L, first verify that the source
   // BoundsKey for the edge is not computed by pointer arithmetic. The pointer
   // arithmetic invalidates the bounds on the pointer, so bounds should not
@@ -975,15 +958,12 @@ bool AVarBoundsInfo::addAssignment(BoundsKey L, BoundsKey R) {
     if (!(PV && PV->isNumConstant()))
       AddEdgeUnlessPointerArithmetic(L, R);
   }
-  return true;
 }
 
-bool AVarBoundsInfo::handlePointerAssignment(clang::Expr *L, clang::Expr *R,
-                                             ASTContext *C,
+void AVarBoundsInfo::handlePointerAssignment(clang::Expr *L, clang::Expr *R,
                                              ConstraintResolver *CR) {
   if (isAssignmentPointerArithmetic(L ,R))
     recordArithmeticOperation(L, CR);
-  return true;
 }
 
 void AVarBoundsInfo::mergeBoundsKey(BoundsKey To, BoundsKey From) {

clang/lib/3C/ConstraintResolver.cpp

@@ -709,7 +709,7 @@ void ConstraintResolver::constrainLocalAssign(Stmt *TSt, Expr *LHS, Expr *RHS,
 
   // Handle pointer arithmetic.
   auto &ABI = Info.getABoundsInfo();
-  ABI.handlePointerAssignment(LHS, RHS, Context, this);
+  ABI.handlePointerAssignment(LHS, RHS, this);
 
   // Only if all types are enabled and these are not pointers, then track
   // the assignment.

clang/lib/3C/CtxSensAVarBounds.cpp

@@ -294,11 +294,10 @@ bool CtxSensitiveBoundsKeyHandler::deriveBoundsKeys(
   return Ret;
 }
 
-bool CtxSensitiveBoundsKeyHandler::handleContextSensitiveAssignment(
+void CtxSensitiveBoundsKeyHandler::handleContextSensitiveAssignment(
     const PersistentSourceLoc &PSL, clang::Decl *L, ConstraintVariable *LCVar,
     clang::Expr *R, CVarSet &RCVars, const std::set<BoundsKey> &CSRKeys,
     ASTContext *C, ConstraintResolver *CR) {
-  bool Ret = false;
   std::set<BoundsKey> AllRBKeys, AllLBKeys, TmpBKeys;
   AllRBKeys = CSRKeys;
 
@@ -318,10 +317,9 @@ bool CtxSensitiveBoundsKeyHandler::handleContextSensitiveAssignment(
   // Add assignment between context sensitive bounds keys.
   for (auto LK : AllLBKeys) {
     for (auto RK : AllRBKeys) {
-      Ret = ABI->addAssignment(LK, RK) || Ret;
+      ABI->addAssignment(LK, RK);
     }
   }
-  return Ret;
 }
 
 bool ContextSensitiveBoundsKeyVisitor::VisitCallExpr(CallExpr *CE) {