Directly use pointer operand of store

Author: nikic

llvm/lib/Transforms/AggressiveInstCombine/AggressiveInstCombine.cpp

@@ -926,11 +926,8 @@ static bool mergePartStores(SmallVectorImpl<PartStore> &Parts,
   if (First.ValOffset != 0)
     Val = Builder.CreateLShr(Val, First.ValOffset);
   Val = Builder.CreateTrunc(Val, NewTy);
-  Value *Ptr = First.PtrBase;
-  if (First.PtrOffset != 0)
-    Ptr = Builder.CreateInBoundsPtrAdd(Ptr, Builder.getInt(First.PtrOffset));
-  StoreInst *Store =
-      Builder.CreateAlignedStore(Val, Ptr, First.Store->getAlign());
+  StoreInst *Store = Builder.CreateAlignedStore(
+      Val, First.Store->getPointerOperand(), First.Store->getAlign());
 
   AAMDNodes AATags = First.Store->getAAMetadata();
   for (const PartStore &Part : drop_begin(Parts))

llvm/test/Transforms/AggressiveInstCombine/X86/store-merge.ll

@@ -322,7 +322,7 @@ define void @test_i32_shift_in_zeros(i32 %x, ptr %p) {
 define void @test_base_ptr_with_offset(i32 %x, ptr %p) {
 ; CHECK-LABEL: define void @test_base_ptr_with_offset(
 ; CHECK-SAME: i32 [[X:%.*]], ptr [[P:%.*]]) {
-; CHECK-NEXT:    [[TMP1:%.*]] = getelementptr inbounds i8, ptr [[P]], i64 7
+; CHECK-NEXT:    [[TMP1:%.*]] = getelementptr i8, ptr [[P]], i64 7
 ; CHECK-NEXT:    store i32 [[X]], ptr [[TMP1]], align 2
 ; CHECK-NEXT:    ret void
 ;
@@ -430,9 +430,9 @@ define i8 @test_aliasing_load_partially_mergeable(i32 %x, ptr %p, ptr %p2) {
 ; CHECK-NEXT:    [[TMP1:%.*]] = trunc i32 [[X]] to i16
 ; CHECK-NEXT:    store i16 [[TMP1]], ptr [[P]], align 1
 ; CHECK-NEXT:    [[V:%.*]] = load i8, ptr [[P2]], align 1
+; CHECK-NEXT:    [[TMP4:%.*]] = getelementptr i8, ptr [[P]], i64 2
 ; CHECK-NEXT:    [[TMP2:%.*]] = lshr i32 [[X]], 16
 ; CHECK-NEXT:    [[TMP3:%.*]] = trunc i32 [[TMP2]] to i16
-; CHECK-NEXT:    [[TMP4:%.*]] = getelementptr inbounds i8, ptr [[P]], i64 2
 ; CHECK-NEXT:    store i16 [[TMP3]], ptr [[TMP4]], align 1
 ; CHECK-NEXT:    ret i8 [[V]]
 ;