!fixup address comments, thanks

Author: fhahn

llvm/lib/Analysis/ConstantFolding.cpp

@@ -1262,12 +1262,12 @@ Constant *llvm::ConstantFoldCompareInstOperands(
       Value *Stripped0 = Ops0->stripAndAccumulateConstantOffsets(
           DL, Offset0, /*AllowNonInbounds=*/IsEqPred,
           /*AllowInvariantGroup=*/false, /*ExternalAnalysis=*/nullptr,
-          /*LookThroughIntToPtr*/ IsEqPred);
+          /*LookThroughIntToPtr=*/IsEqPred);
       APInt Offset1(IndexWidth, 0);
       Value *Stripped1 = Ops1->stripAndAccumulateConstantOffsets(
           DL, Offset1, /*AllowNonInbounds=*/IsEqPred,
           /*AllowInvariantGroup=*/false, /*ExternalAnalysis=*/nullptr,
-          /*LookThroughIntToPtr*/ IsEqPred);
+          /*LookThroughIntToPtr=*/IsEqPred);
       if (Stripped0 == Stripped1)
         return ConstantInt::getBool(
             Ops0->getContext(),

llvm/lib/IR/Value.cpp

@@ -792,8 +792,7 @@ const Value *Value::stripAndAccumulateConstantOffsets(
       if (!Ptr2Int || !CI)
         return V;
 
-      const APInt &AddOffset = CI->getValue();
-      Offset += AddOffset;
+      Offset += CI->getValue();
       V = Ptr2Int->getOperand(0);
     }
     assert(V->getType()->isPtrOrPtrVectorTy() && "Unexpected operand type!");

llvm/test/Transforms/InstSimplify/constant-fold-inttoptr-add.ll

@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
-; RUN: opt -p instcombine -S %s | FileCheck %s
+; RUN: opt -p instsimplify -S %s | FileCheck %s
 
 @glob = external global [314 x i64]
 
@@ -15,7 +15,7 @@ define i1 @known_constexpr_add_eq_ops_swapped() {
 ; CHECK-LABEL: define i1 @known_constexpr_add_eq_ops_swapped() {
 ; CHECK-NEXT:    ret i1 false
 ;
-  %cond = icmp eq ptr getelementptr inbounds nuw (i8, ptr @glob, i64 80), inttoptr (i64 add (i64 ptrtoint (ptr @glob to i64), i64 -80) to ptr)
+  %cond = icmp eq ptr inttoptr (i64 add (i64 ptrtoint (ptr @glob to i64), i64 -80) to ptr), getelementptr inbounds nuw (i8, ptr @glob, i64 80)
   ret i1 %cond
 }