Address code review comments and add getConstantInt

Author: AmrDeveloper

clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h

@@ -32,6 +32,11 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
     return create<cir::ConstantOp>(loc, attr.getType(), attr);
   }
 
+  cir::ConstantOp getConstantInt(mlir::Location loc, mlir::Type ty,
+                                 int64_t value) {
+    return create<cir::ConstantOp>(loc, ty, cir::IntAttr::get(ty, value));
+  }
+
   // Creates constant null value for integral type ty.
   cir::ConstantOp getNullValue(mlir::Type ty, mlir::Location loc) {
     return create<cir::ConstantOp>(loc, ty, getZeroInitAttr(ty));

clang/include/clang/CIR/Dialect/IR/CIROps.td

@@ -268,9 +268,6 @@ def PtrStrideOp : CIR_Op<"ptr_stride",
       return mlir::cast<cir::PointerType>(getBase().getType()).getPointee();
     }
   }];
-
-  // SameFirstOperandAndResultType already checks all we need.
-  let hasVerifier = 0;
 }
 
 //===----------------------------------------------------------------------===//

clang/lib/CIR/CodeGen/CIRGenExprAggregate.cpp

@@ -122,8 +122,7 @@ void AggExprEmitter::emitArrayInit(Address destPtr, cir::ArrayType arrayTy,
   for (uint64_t i = 0; i != numInitElements; ++i) {
     // Advance to the next element.
     if (i > 0) {
-      one = builder.create<cir::ConstantOp>(
-          loc, cgf.PtrDiffTy, cir::IntAttr::get(cgf.PtrDiffTy, i));
+      one = builder.getConstantInt(loc, cgf.PtrDiffTy, i);
       element =
           builder.create<cir::PtrStrideOp>(loc, cirElementPtrType, begin, one);
     }
@@ -146,8 +145,7 @@ void AggExprEmitter::emitArrayInit(Address destPtr, cir::ArrayType arrayTy,
         cgf.getTypes().isZeroInitializable(elementType))) {
     // Advance to the start of the rest of the array.
     if (numInitElements) {
-      one = builder.create<cir::ConstantOp>(
-          loc, cgf.PtrDiffTy, cir::IntAttr::get(cgf.PtrDiffTy, 1));
+      one = builder.getConstantInt(loc, cgf.PtrDiffTy, 1);
       element = builder.create<cir::PtrStrideOp>(loc, cirElementPtrType,
                                                  element, one);
     }
@@ -173,9 +171,7 @@ void AggExprEmitter::emitArrayInit(Address destPtr, cir::ArrayType arrayTy,
         emitNullInitializationToLValue(loc, elementLV);
 
       // Advance pointer and store them to temporary variable
-      one = builder.create<cir::ConstantOp>(
-          loc, cgf.PtrDiffTy, cir::IntAttr::get(cgf.PtrDiffTy, 1));
-
+      one = builder.getConstantInt(loc, cgf.PtrDiffTy, 1);
       auto nextElement = builder.create<cir::PtrStrideOp>(
           loc, cirElementPtrType, currentElement, one);
       cgf.emitStoreThroughLValue(RValue::get(nextElement), tmpLV);

clang/lib/CIR/CodeGen/CIRGenFunction.cpp

@@ -489,9 +489,7 @@ void CIRGenFunction::emitNullInitialization(mlir::Location loc, Address destPtr,
   // Builder.CreateMemSet. In CIR just emit a store of #cir.zero to the
   // respective address.
   // Builder.CreateMemSet(DestPtr, Builder.getInt8(0), SizeVal, false);
-  auto zeroAttr = cir::ZeroAttr::get(builder.getContext(), convertType(ty));
-  auto zeroValue =
-      builder.create<cir::ConstantOp>(loc, convertType(ty), zeroAttr);
+  auto zeroValue = builder.getNullValue(convertType(ty), loc);
   builder.createStore(loc, zeroValue, destPtr.getPointer());
 }