Add not null assert when de-referencing access paths and fix some depreciated warnings

Author: vidsinghal

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

@@ -6280,6 +6280,7 @@ struct AAPointerInfo : public AbstractAttribute {
 
     // Merge two access paths into one.
     void mergeAccessPaths(const AccessPathSetTy *AccessPathsNew) const {
+      assert(AccessPathsNew != nullptr && "Expected Access Paths to be non null!");
       for (auto *Path : *AccessPathsNew)
         if (!existsChain(Path))
           AccessPaths->insert(Path);
@@ -6290,7 +6291,8 @@ struct AAPointerInfo : public AbstractAttribute {
       bool IsSame = true;
       if (AccessPaths->size() != AccessPathsR->size())
         return false;
-
+      
+      assert(AccessPathsR != nullptr && "Expected Access Paths to be non null!");
       for (auto *Path : *AccessPathsR) {
         if (!existsChain(Path))
           IsSame = false;
@@ -6300,8 +6302,9 @@ struct AAPointerInfo : public AbstractAttribute {
 
     // Check if the chain exists in the AccessPathsSet.
     bool existsChain(const AccessPathTy *NewPath) const {
+      assert(NewPath != nullptr && AccessPaths != nullptr && "Expected Access Paths to be non null!");
       for (auto *OldPath : *AccessPaths)
-        if (*OldPath == *NewPath)
+        if (OldPath && *OldPath == *NewPath)
           return true;
 
       return false;
@@ -6310,6 +6313,7 @@ struct AAPointerInfo : public AbstractAttribute {
     void dumpAccessPaths(raw_ostream &O) const {
       O << "Print all access paths found:"
         << "\n";
+      assert(AccessPaths != nullptr && "Expected Access Paths to be non null!");
       for (auto *It : *AccessPaths) {
         O << "Backtrack a unique access path:\n";
         for (Value *Ins : *It) {

llvm/lib/Transforms/IPO/AttributorAttributes.cpp

@@ -13870,11 +13870,11 @@ struct AAAllocationInfoImpl : public AAAllocationInfo {
         int64_t ShiftValue = OffsetNew - OffsetOld;
         Value *IndexList[1] = {ConstantInt::get(Int64TyInteger, ShiftValue)};
         Value *GepToNewAddress = GetElementPtrInst::Create(
-            PointeeTy, PointerOperand, IndexList, "NewGep", OldLoadInst);
+            PointeeTy, PointerOperand, IndexList, "NewGep", OldLoadInst->getIterator());
 
         LoadInst *NewLoadInst = new LoadInst(
             OldLoadInst->getType(), GepToNewAddress, OldLoadInst->getName(),
-            false, OldLoadInst->getAlign(), OldLoadInst);
+            false, OldLoadInst->getAlign(), OldLoadInst->getIterator());
 
         Changed |=
             A.changeAfterManifest(IRPosition::inst(*OldLoadInst), *NewLoadInst);
@@ -13893,11 +13893,11 @@ struct AAAllocationInfoImpl : public AAAllocationInfo {
         Type *PointeeTy = OldStoreInst->getPointerOperandType();
         Value *IndexList[1] = {ConstantInt::get(Int64TyInteger, ShiftValue)};
         Value *GepToNewAddress = GetElementPtrInst::Create(
-            PointeeTy, PointerOperand, IndexList, "NewGep", OldStoreInst);
+            PointeeTy, PointerOperand, IndexList, "NewGep", OldStoreInst->getIterator());
 
         StoreInst *NewStoreInst =
             new StoreInst(OldStoreInst->getValueOperand(), GepToNewAddress,
-                          false, OldStoreInst->getAlign(), OldStoreInst);
+                          false, OldStoreInst->getAlign(), OldStoreInst->getIterator());
 
         Changed |= A.changeAfterManifest(IRPosition::inst(*OldStoreInst),
                                          *NewStoreInst);
@@ -13911,7 +13911,7 @@ struct AAAllocationInfoImpl : public AAAllocationInfo {
         Value *IndexList[1] = {ConstantInt::get(Int64TyInteger, OffsetNew)};
         Value *OldPointerOperand = OldGEP->getPointerOperand();
         Value *GepToNewAddress = GetElementPtrInst::Create(
-            NewAllocationType, OldPointerOperand, IndexList, "NewGep", OldGEP);
+            NewAllocationType, OldPointerOperand, IndexList, "NewGep", OldGEP->getIterator());
 
         Changed |=
             A.changeAfterManifest(IRPosition::inst(*OldGEP), *GepToNewAddress);