Added genPtrCompare builder.

Author: vzakhari

flang/include/flang/Optimizer/Builder/FIRBuilder.h

@@ -630,6 +630,15 @@ class FirOpBuilder : public mlir::OpBuilder, public mlir::OpBuilder::Listener {
     return result;
   }
 
+  /// Compare two pointer-like values using the given predicate.
+  mlir::Value genPtrCompare(mlir::Location loc,
+                            mlir::arith::CmpIPredicate predicate,
+                            mlir::Value ptr1, mlir::Value ptr2) {
+    ptr1 = createConvert(loc, getIndexType(), ptr1);
+    ptr2 = createConvert(loc, getIndexType(), ptr2);
+    return create<mlir::arith::CmpIOp>(loc, predicate, ptr1, ptr2);
+  }
+
 private:
   /// Set attributes (e.g. FastMathAttr) to \p op operation
   /// based on the current attributes setting.

flang/lib/Optimizer/CodeGen/LowerRepackArrays.cpp

@@ -284,14 +284,11 @@ UnpackArrayConversion::matchAndRewrite(fir::UnpackArrayOp op,
         fir::HeapType::get(fir::extractSequenceType(tempBox.getType()));
     mlir::Value tempAddr =
         builder.create<fir::BoxAddrOp>(loc, addrType, tempBox);
-    mlir::Value tempAddrAsIndex =
-        builder.createConvert(loc, indexType, tempAddr);
     mlir::Value originalAddr =
         builder.create<fir::BoxAddrOp>(loc, addrType, originalBox);
-    originalAddr = builder.createConvert(loc, indexType, originalAddr);
 
-    auto isNotSame = builder.create<mlir::arith::CmpIOp>(
-        loc, mlir::arith::CmpIPredicate::ne, tempAddrAsIndex, originalAddr);
+    auto isNotSame = builder.genPtrCompare(loc, mlir::arith::CmpIPredicate::ne,
+                                           tempAddr, originalAddr);
     builder.genIfThen(loc, isNotSame).genThen([&]() {});
     // Copy from temporary to the original.
     if (!op.getNoCopy())