Fix Rebase and tests

Author: vidsinghal

llvm/include/llvm/Transforms/IPO/Attributor.h

@@ -5957,7 +5957,12 @@ struct AAPointerInfo : public AbstractAttribute {
     /// actual use of the list. So we just blindly append here.
 
     bool merge(const OffsetInfo &R) {
-      bool Changed =  set_union(Ranges, R.Ranges);
+
+      SmallSet<AA::RangeTy, 2> Set1(Ranges.begin(), Ranges.end());
+      SmallSet<AA::RangeTy, 2> Set2(R.Ranges.begin(), R.Ranges.end());
+
+      bool Changed = set_union(Set1, Set2);
+      Ranges.append(R.Ranges);
       // ensure elements are unique.
       sort(Ranges.begin(), Ranges.end());
       Ranges.erase(std::unique(Ranges.begin(), Ranges.end()), Ranges.end());
@@ -5974,7 +5979,11 @@ struct AAPointerInfo : public AbstractAttribute {
     // and adds it to the corresponding offset in the
     // origins map.
     bool mergeWithOffset(const OffsetInfo &R, Value &CurPtr) {
-      bool Changed = set_union(Ranges, R.Ranges);
+      SmallSet<AA::RangeTy, 2> Set1(Ranges.begin(), Ranges.end());
+      SmallSet<AA::RangeTy, 2> Set2(R.Ranges.begin(), R.Ranges.end());
+
+      bool Changed = set_union(Set1, Set2);
+      Ranges.append(R.Ranges);
       // ensure elements are unique.
       sort(Ranges.begin(), Ranges.end());
       Ranges.erase(std::unique(Ranges.begin(), Ranges.end()), Ranges.end());
@@ -6386,7 +6395,7 @@ struct AAPointerInfo : public AbstractAttribute {
   virtual const_bin_iterator end() const = 0;
   virtual int64_t numOffsetBins() const = 0;
   virtual bool reachesReturn() const = 0;
-  virtual void addReturnedOffsetsTo(OffsetInfo &) const = 0;
+  virtual void addReturnedOffsetsTo(OffsetInfo &, Value &V) const = 0;
   virtual void dumpState(raw_ostream &O) const = 0;
   virtual const Access &getBinAccess(unsigned Index) const = 0;
   virtual const DenseMap<Value *, OffsetInfo> &getOffsetInfoMap() const = 0;

llvm/lib/Transforms/IPO/AttributorAttributes.cpp

@@ -1143,7 +1143,13 @@ struct AAPointerInfoImpl
            (reachesReturn()
                 ? (" (returned:" +
                    join(map_range(ReturnedOffsets,
-                                  [](int64_t O) { return std::to_string(O); }),
+                                  [](AA::RangeTy O) {
+                                    return std::string("(") +
+                                           std::to_string(O.Offset) +
+                                           std::string(",") +
+                                           std::to_string(O.Size) +
+                                           std::string(")");
+                                  }),
                         ", ") +
                    ")")
                 : "");
@@ -1160,26 +1166,27 @@ struct AAPointerInfoImpl
   bool reachesReturn() const override {
     return !ReturnedOffsets.isUnassigned();
   }
-  void addReturnedOffsetsTo(OffsetInfo &OI) const override {
+  void addReturnedOffsetsTo(OffsetInfo &OI, Value &Origin) const override {
     if (ReturnedOffsets.isUnknown()) {
-      OI.setUnknown();
+      OI.setUnknown(Origin);
       return;
     }
 
     OffsetInfo MergedOI;
     for (auto Offset : ReturnedOffsets) {
       OffsetInfo TmpOI = OI;
-      TmpOI.addToAll(Offset);
+      TmpOI.addToAll(Offset.Offset);
       MergedOI.merge(TmpOI);
     }
     OI = std::move(MergedOI);
   }
 
-  ChangeStatus setReachesReturn(const OffsetInfo &ReachedReturnedOffsets) {
+  ChangeStatus setReachesReturn(const OffsetInfo &ReachedReturnedOffsets,
+                                Value &V) {
     if (ReturnedOffsets.isUnknown())
       return ChangeStatus::UNCHANGED;
     if (ReachedReturnedOffsets.isUnknown()) {
-      ReturnedOffsets.setUnknown();
+      ReturnedOffsets.setUnknown(V);
       return ChangeStatus::CHANGED;
     }
     if (ReturnedOffsets.merge(ReachedReturnedOffsets))
@@ -1486,7 +1493,7 @@ struct AAPointerInfoImpl
     ChangeStatus Changed = ChangeStatus::UNCHANGED;
     const auto &OtherAAImpl = static_cast<const AAPointerInfoImpl &>(OtherAA);
     bool IsByval = OtherAAImpl.getAssociatedArgument()->hasByValAttr();
-    Changed |= setReachesReturn(OtherAAImpl.ReturnedOffsets);
+    Changed |= setReachesReturn(OtherAAImpl.ReturnedOffsets, CB);
 
     // Combine the accesses bin by bin.
     const auto &State = OtherAAImpl.getState();
@@ -1829,7 +1836,7 @@ ChangeStatus AAPointerInfoFloating::updateImpl(Attributor &A) {
     if (auto *RI = dyn_cast<ReturnInst>(Usr)) {
       if (RI->getFunction() == getAssociatedFunction()) {
         auto &PtrOI = OffsetInfoMap[CurPtr];
-        Changed |= setReachesReturn(PtrOI);
+        Changed |= setReachesReturn(PtrOI, *CurPtr);
         return true;
       }
       return false;
@@ -2087,7 +2094,7 @@ ChangeStatus AAPointerInfoFloating::updateImpl(Attributor &A) {
         if (!CSRetPI)
           return false;
         OffsetInfo OI = OffsetInfoMap[CurPtr];
-        CSArgPI->addReturnedOffsetsTo(OI);
+        CSArgPI->addReturnedOffsetsTo(OI, *CurPtr);
         Changed =
             translateAndAddState(A, *CSRetPI, OI, *CB, IsRetMustAcc) | Changed;
         return isValidState();
@@ -13703,8 +13710,9 @@ struct AAAllocationInfoImpl : public AAAllocationInfo {
         [](DenseMap<Instruction *, DenseMap<AA::RangeTy, AA::RangeTy>> &Map,
            Instruction *LocalInst, const AA::RangeTy &OldRange,
            const AA::RangeTy &NewRange) {
+          auto [It, Inserted] = Map.try_emplace(LocalInst);
           DenseMap<AA::RangeTy, AA::RangeTy> &NewBinsForInstruction =
-              Map.getOrInsertDefault(LocalInst);
+              It->second;
 
           NewBinsForInstruction.insert(std::make_pair(OldRange, NewRange));
         };
@@ -14036,11 +14044,12 @@ struct AAAllocationInfoImpl : public AAAllocationInfo {
     if (OldOffset == NewComputedOffset)
       return false;
 
-    AA::RangeTy &NewRange = NewComputedOffsets.getOrInsertDefault(OldRange);
+    auto [It, Inserted] = NewComputedOffsets.try_emplace(OldRange);
+    AA::RangeTy &NewRange = It->second;
     NewRange.Offset = NewComputedOffset;
     NewRange.Size = Size;
 
-    return true;
+    return Inserted;
   }
 
   // A helper function to check if simplified values exists for the current

llvm/test/Transforms/Attributor/ArgumentPromotion/live_called_from_dead_2.ll

@@ -52,9 +52,9 @@ define internal i32 @caller(ptr %B) {
 ;
 ; CGSCC: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(argmem: write)
 ; CGSCC-LABEL: define {{[^@]+}}@caller
-; CGSCC-SAME: (ptr noalias nocapture nofree noundef nonnull writeonly align 4 dereferenceable(4) [[B:%.*]]) #[[ATTR0]] {
+; CGSCC-SAME: (ptr noalias nofree noundef nonnull writeonly align 4 captures(none) dereferenceable(4) [[B:%.*]]) #[[ATTR0]] {
 ; CGSCC-NEXT:    [[A1:%.*]] = alloca [0 x i8], align 1
-; CGSCC-NEXT:    [[C:%.*]] = call i32 @test(ptr noalias nocapture nofree noundef nonnull writeonly align 4 dereferenceable(4) [[B]]) #[[ATTR2:[0-9]+]]
+; CGSCC-NEXT:    [[C:%.*]] = call i32 @test(ptr noalias nofree noundef nonnull writeonly align 4 captures(none) dereferenceable(4) [[B]]) #[[ATTR2:[0-9]+]]
 ; CGSCC-NEXT:    ret i32 0
 ;
   %A = alloca i32

llvm/test/Transforms/Attributor/IPConstantProp/pthreads.ll

@@ -34,8 +34,8 @@ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 define dso_local i32 @main() {
 ; TUNIT-LABEL: define {{[^@]+}}@main() {
 ; TUNIT-NEXT:  entry:
-; TUNIT-NEXT:    [[ALLOC11:%.*]] = alloca [0 x i8], align 1
-; TUNIT-NEXT:    [[ALLOC22:%.*]] = alloca [0 x i8], align 1
+; TUNIT-NEXT:    [[ALLOC1:%.*]] = alloca i8, align 8
+; TUNIT-NEXT:    [[ALLOC2:%.*]] = alloca i8, align 8
 ; TUNIT-NEXT:    [[THREAD:%.*]] = alloca i64, align 8
 ; TUNIT-NEXT:    [[CALL:%.*]] = call i32 @pthread_create(ptr noundef nonnull align 8 dereferenceable(8) [[THREAD]], ptr noundef null, ptr noundef nonnull @foo, ptr nofree readnone undef)
 ; TUNIT-NEXT:    [[CALL1:%.*]] = call i32 @pthread_create(ptr noundef nonnull align 8 dereferenceable(8) [[THREAD]], ptr noundef null, ptr noundef nonnull @bar, ptr noalias nofree nonnull readnone align 8 captures(none) dereferenceable(8) undef)