Merge pull request #310 from correctcomputation/revert-309-arrbndsdebug

Revert "Fixing array length inference performance issue"

Author: Machiry

clang/include/clang/CConv/AVarBoundsInfo.h

@@ -103,10 +103,12 @@ class AvarBoundsInference {
                            AVarGraph &BKGraph,
                            std::set<ABounds *> &EB);
 
-  // Check if bounds specified by Bnds are declared bounds of K.
-  bool areDeclaredBounds(BoundsKey K,
-                         const std::pair<ABounds::BoundsKind,
-                                         std::set<BoundsKey>> &Bnds);
+  bool intersectBounds(std::set<ProgramVar *> &ProgVars,
+                       ABounds::BoundsKind BK,
+                       std::set<ABounds *> &CurrB);
+
+  bool getRelevantBounds(std::set<BoundsKey> &RBKeys,
+                         std::set<ABounds *> &ResBounds);
 
   bool predictBounds(BoundsKey K, std::set<BoundsKey> &Neighbours,
                      AVarGraph &BKGraph,
@@ -236,7 +238,7 @@ class AVarBoundsInfo {
   BoundsKey BCount;
   // Map of VarKeys and corresponding program variables.
   std::map<BoundsKey, ProgramVar *> PVarInfo;
-  // Map of APSInt (constants) and a BoundKey that correspond to it.
+  // Map of APSInt (constants) and corresponding VarKeys.
   std::map<uint64_t, BoundsKey> ConstVarKeys;
   // Map of BoundsKey and corresponding prioritized bounds information.
   // Note that although each PSL could have multiple ConstraintKeys Ex: **p.

clang/include/clang/CConv/ConstraintsGraph.h

@@ -134,17 +134,7 @@ class DataGraph :
     BL->connectTo(*BR);
   }
 
-  void addUniqueEdge(Data L, Data R) {
-    NodeType *BL = this->findOrCreateNode(L);
-    NodeType *BR = this->findOrCreateNode(R);
-    llvm::SmallVector<EdgeType*, 10> Edges;
-    BL->findEdgesTo(*BR, Edges);
-    if (Edges.empty()) {
-      addEdge(L, R);
-    }
-  }
-
-  bool getNeighbors(Data D, std::set<Data> &DataSet, bool Succ) {
+  bool getNeighbors(Data D, std::set<Data> &DataSet, bool Succ){
     auto *N = this->findNode(NodeType(D));
     if (N == this->end())
       return false;

clang/lib/CConv/AVarBoundsInfo.cpp

@@ -393,12 +393,10 @@ bool AVarBoundsInfo::addAssignment(BoundsKey L, BoundsKey R) {
     // dependency and never will be able to find the bounds for the return
     // value.
     if (L != R)
-      ProgVarGraph.addUniqueEdge(R, L);
+      ProgVarGraph.addEdge(R, L);
   } else {
-    ProgVarGraph.addUniqueEdge(R, L);
-    ProgramVar *PV = getProgramVar(R);
-    if (!(PV && PV->IsNumConstant()))
-      ProgVarGraph.addUniqueEdge(L, R);
+    ProgVarGraph.addEdge(L, R);
+    ProgVarGraph.addEdge(R, L);
   }
   return true;
 }
@@ -714,45 +712,7 @@ bool AvarBoundsInference::inferPossibleBounds(BoundsKey K, ABounds *SB,
     }
   }
 
-  // All constants are reachable!
-  if (SBVar->IsNumConstant()) {
-    PotK.insert(FromVarK);
-  }
-
-  // Get all bounds key that are equivalent to FromVarK
-  std::set<BoundsKey> AllFKeys;
-  AllFKeys.clear();
-  AllFKeys.insert(FromVarK);
-
-  for (auto CurrVarK : AllFKeys) {
-    // Find all the in scope variables reachable from the CurrVarK
-    // bounds variable.
-    ScopeVisitor TV(DstScope, PotK, BI->PVarInfo,
-                    BI->PointerBoundsKey);
-    BKGraph.visitBreadthFirst(CurrVarK, [&TV](BoundsKey BK) {
-      TV.visitBoundsKey(BK);
-    });
-  }
-
-  // This is to get all the constants that are assigned to the variables
-  // reachable from FromVarK.
-  if (!SBVar->IsNumConstant()) {
-    std::set<BoundsKey> ReachableCons;
-    std::set<BoundsKey> Pre;
-    for (auto CK : PotK) {
-      Pre.clear();
-      BKGraph.getPredecessors(CK, Pre);
-      for (auto T : Pre) {
-        auto *TVar = BI->getProgramVar(T);
-        if (TVar->IsNumConstant()) {
-          ReachableCons.insert(T);
-        }
-      }
-    }
-    PotK.insert(ReachableCons.begin(), ReachableCons.end());
-  }
-
-  return !PotK.empty();
+  return RetVal;
 }
 
 bool AvarBoundsInference::getRelevantBounds(std::set<BoundsKey> &RBKeys,
@@ -1105,10 +1065,11 @@ bool AVarBoundsInfo::performFlowAnalysis(ProgramInfo *PI) {
   // Any thing changed? which means bounds of a variable changed
   // Which means we need to recompute the flow based bounds for
   // all arrays that have flow based bounds.
-  keepHighestPriorityBounds(ArrPointerBoundsKey);
-  // Remove flow inferred bounds, if exist for all the array pointers.
-  for (auto TBK : ArrPointerBoundsKey)
-    removeBounds(TBK, FlowInferred);
+  if (keepHighestPriorityBounds(ArrPointerBoundsKey)) {
+    // Remove flow inferred bounds, if exist for all the array pointers.
+    for (auto TBK : ArrPointerBoundsKey)
+      removeBounds(TBK, FlowInferred);
+  }
 
   // Next, get the ARR pointers that has bounds.
   // These are pointers with bounds.