[LVI] Fix miscompilation

Author: dtcxzyw

llvm/lib/Analysis/LazyValueInfo.cpp

@@ -622,10 +622,12 @@ LazyValueInfoImpl::solveBlockValueImpl(Value *Val, BasicBlock *BB) {
   return getFromRangeMetadata(BBI);
 }
 
-static void AddNonNullPointer(Value *Ptr, NonNullPointerSet &PtrSet) {
+static void AddNonNullPointer(Value *Ptr, NonNullPointerSet &PtrSet,
+                              bool IsDereferenced = true) {
   // TODO: Use NullPointerIsDefined instead.
   if (Ptr->getType()->getPointerAddressSpace() == 0)
-    PtrSet.insert(getUnderlyingObject(Ptr));
+    PtrSet.insert(IsDereferenced ? getUnderlyingObject(Ptr)
+                                 : Ptr->stripInBoundsOffsets());
 }
 
 static void AddNonNullPointersByInstruction(
@@ -649,7 +651,7 @@ static void AddNonNullPointersByInstruction(
       if (U->getType()->isPointerTy() &&
           CB->paramHasNonNullAttr(CB->getArgOperandNo(&U),
                                   /*AllowUndefOrPoison=*/false))
-        AddNonNullPointer(U.get(), PtrSet);
+        AddNonNullPointer(U.get(), PtrSet, /*IsDereferenced=*/false);
     }
   }
 }

llvm/test/Transforms/CorrelatedValuePropagation/non-null.ll

@@ -433,7 +433,7 @@ define i1 @test_known_nonnull_at_callsite_gep_without_inbounds(ptr %src, i64 %x)
 ; CHECK-NEXT:    [[GEP:%.*]] = getelementptr i8, ptr [[SRC:%.*]], i64 [[X:%.*]]
 ; CHECK-NEXT:    call void @callee(ptr noundef nonnull [[GEP]])
 ; CHECK-NEXT:    [[NONNULL:%.*]] = icmp eq ptr [[SRC]], null
-; CHECK-NEXT:    ret i1 false
+; CHECK-NEXT:    ret i1 [[NONNULL]]
 ;
 entry:
   %gep = getelementptr i8, ptr %src, i64 %x