Address review feedback

Author: andykaylor

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

@@ -2459,10 +2459,6 @@ def CIR_CopyOp : CIR_Op<"copy",[
   SameTypeOperands,
   DeclareOpInterfaceMethods<PromotableMemOpInterface>
 ]> {
-  let arguments = (ins
-      Arg<CIR_PointerType, "", [MemWrite]>:$dst,
-      Arg<CIR_PointerType, "", [MemRead]>:$src
-  );
   let summary = "Copies contents from a CIR pointer to another";
   let description = [{
     Given two CIR pointers, `src` and `dst`, `cir.copy` will copy the memory
@@ -2480,6 +2476,11 @@ def CIR_CopyOp : CIR_Op<"copy",[
     ```
   }];
 
+  let arguments = (ins
+      Arg<CIR_PointerType, "", [MemWrite]>:$dst,
+      Arg<CIR_PointerType, "", [MemRead]>:$src
+  );
+
   let assemblyFormat = [{$src `to` $dst
                         attr-dict `:` qualified(type($dst))
   }];
@@ -2490,9 +2491,9 @@ def CIR_CopyOp : CIR_Op<"copy",[
     cir::PointerType getType() { return getSrc().getType(); }
 
     /// Returns the number of bytes to be copied.
-    unsigned getLength() {
-      return mlir::DataLayout::closest(*this).getTypeSize(getType().getPointee());
-    }
+    unsigned getLength(const mlir::DataLayout &dt) {
+      return dt.getTypeSize(getType().getPointee());
+    }    
   }];
 }
 

clang/lib/CIR/Dialect/IR/CIRMemorySlot.cpp

@@ -153,7 +153,7 @@ bool cir::CopyOp::canUsesBeRemoved(
   if (getDst() == getSrc())
     return false;
 
-  return getLength() == dataLayout.getTypeSize(slot.elemType);
+  return getLength(dataLayout) == dataLayout.getTypeSize(slot.elemType);
 }
 
 //===----------------------------------------------------------------------===//

clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp

@@ -176,8 +176,9 @@ mlir::LLVM::Linkage convertLinkage(cir::GlobalLinkageKind linkage) {
 mlir::LogicalResult CIRToLLVMCopyOpLowering::matchAndRewrite(
     cir::CopyOp op, OpAdaptor adaptor,
     mlir::ConversionPatternRewriter &rewriter) const {
+  mlir::DataLayout layout(op->getParentOfType<mlir::ModuleOp>());
   const mlir::Value length = mlir::LLVM::ConstantOp::create(
-      rewriter, op.getLoc(), rewriter.getI32Type(), op.getLength());
+      rewriter, op.getLoc(), rewriter.getI32Type(), op.getLength(layout));
   assert(!cir::MissingFeatures::aggValueSlotVolatile());
   rewriter.replaceOpWithNewOp<mlir::LLVM::MemcpyOp>(
       op, adaptor.getDst(), adaptor.getSrc(), length, /*isVolatile=*/false);