Revert "last ok"

This reverts commit d037d8a0978d4b90c791726b9ebedc75f61eb249.

Author: yukatan1701

include/tsar/Analysis/Memory/MemoryLocationRange.h

@@ -223,8 +223,7 @@ struct MemoryLocationRange {
     if (DimList.empty())
       return *this;
     assert(UpperBound.hasValue() && "UpperBound must have a value!");
-    auto FullSize = UpperBound.getValue();
-    // FIXME: rewrite with zero dimension; incorrect algorithm.
+    auto FullSize = UpperBound.getValue();;
     for (std::size_t I = 1; I < DimList.size(); ++I)
       FullSize *= DimList[I].DimSize;
     return MemoryLocationRange(Ptr, 0, LocationSize(FullSize), AATags);

lib/Analysis/Memory/DefinedMemory.cpp

@@ -401,22 +401,19 @@ std::pair<MemoryLocationRange, bool> aggregate(
       // for <lhs[?]:1..4, 0, 600>: cover all array
       bool IsNonCollapsable = false;
       auto FullSize = ElemSize;
-      for (size_t I = 0; I < ArrayPtr->getNumberOfDims(); ++I) {
+      for (size_t I = 1; I < ArrayPtr->getNumberOfDims(); ++I) {
         auto DimSizeSCEV = ArrayPtr->getDimSize(I);
         if (ArrayPtr->isKnownDimSize(I) && isa<SCEVConstant>(DimSizeSCEV)) {
-          LLVM_DEBUG(dbgs() << "Dim size: [" <<  cast<SCEVConstant>(DimSizeSCEV)->getAPInt().getZExtValue() << "]\n");
           FullSize *= cast<SCEVConstant>(DimSizeSCEV)->getAPInt().getZExtValue();
         } else {
           IsNonCollapsable = true;
           break;
         }
       }
-      if (!IsNonCollapsable && FullSize > 0) {
-        ResLoc.Ptr = GV;
+      if (!IsNonCollapsable) {
         ResLoc.LowerBound = 0;
         ResLoc.UpperBound = FullSize;
         ResLoc.Kind = LocKind::Default;
-        LLVM_DEBUG(dbgs() << "Extend location: "; printLocationSource(dbgs(), ResLoc); dbgs() << "\n");
       }
     }
     return std::make_pair(ResLoc, true);
@@ -1316,7 +1313,7 @@ void ReachDFFwk::collapse(DFRegion *R) {
           continue;
       }
       //LLVM_DEBUG(printLocInfo("[COLLAPSE] Collapse Use location: ", Loc));
-      distribute(aggregate(R, N, Loc, this, true), Loc, OwnUses, OtherUses);
+      distribute(aggregate(R, N, Loc, this), Loc, OwnUses, OtherUses);
     }
     LocationSet NewUses;
     for (auto &Loc : OwnUses) {