[CIR][NFC] Remove redundant pointer casts (#1609)

Author: xlauko

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

@@ -374,7 +374,7 @@ def PtrStrideOp : CIR_Op<"ptr_stride",
   let extraClassDeclaration = [{
     // Get type pointed by the base pointer.
     mlir::Type getElementTy() {
-      return mlir::cast<cir::PointerType>(getBase().getType()).getPointee();
+      return getBase().getType().getPointee();
     }
   }];
 }
@@ -2870,7 +2870,7 @@ def GetMemberOp : CIR_Op<"get_member"> {
 
     /// Return the result type.
     cir::PointerType getResultTy() {
-      return mlir::cast<cir::PointerType>(getResult().getType());
+      return getResult().getType();
     }
   }];
 

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

@@ -961,8 +961,8 @@ OpFoldResult cir::ComplexImagOp::fold(FoldAdaptor adaptor) {
 //===----------------------------------------------------------------------===//
 
 LogicalResult cir::ComplexRealPtrOp::verify() {
-  auto resultPointeeTy = mlir::cast<cir::PointerType>(getType()).getPointee();
-  auto operandPtrTy = mlir::cast<cir::PointerType>(getOperand().getType());
+  mlir::Type resultPointeeTy = getType().getPointee();
+  cir::PointerType operandPtrTy = getOperand().getType();
   auto operandPointeeTy =
       mlir::cast<cir::ComplexType>(operandPtrTy.getPointee());
 
@@ -976,8 +976,8 @@ LogicalResult cir::ComplexRealPtrOp::verify() {
 }
 
 LogicalResult cir::ComplexImagPtrOp::verify() {
-  auto resultPointeeTy = mlir::cast<cir::PointerType>(getType()).getPointee();
-  auto operandPtrTy = mlir::cast<cir::PointerType>(getOperand().getType());
+  mlir::Type resultPointeeTy = getType().getPointee();
+  cir::PointerType operandPtrTy = getOperand().getType();
   auto operandPointeeTy =
       mlir::cast<cir::ComplexType>(operandPtrTy.getPointee());
 
@@ -3661,7 +3661,7 @@ LogicalResult cir::GetMethodOp::verify() {
   auto methodTy = getMethod().getType();
 
   // Assume objectTy is !cir.ptr<!T>
-  auto objectPtrTy = mlir::cast<cir::PointerType>(getObject().getType());
+  cir::PointerType objectPtrTy = getObject().getType();
   auto objectTy = objectPtrTy.getPointee();
 
   if (methodTy.getClsTy() != objectTy) {
@@ -3670,8 +3670,7 @@ LogicalResult cir::GetMethodOp::verify() {
   }
 
   // Assume methodFuncTy is !cir.func<!Ret (!Args)>
-  auto calleePtrTy = mlir::cast<cir::PointerType>(getCallee().getType());
-  auto calleeTy = mlir::cast<cir::FuncType>(calleePtrTy.getPointee());
+  auto calleeTy = mlir::cast<cir::FuncType>(getCallee().getType().getPointee());
   auto methodFuncTy = methodTy.getMemberFuncTy();
 
   // We verify at here that calleeTy is !cir.func<!Ret (!cir.ptr<!void>, !Args)>

clang/lib/CIR/Dialect/Transforms/LifetimeCheck.cpp

@@ -1029,7 +1029,7 @@ void LifetimeCheckPass::classifyAndInitTypeCategories(mlir::Value addr,
       if (eltAddr.use_empty())
         return;
 
-      auto eltTy = mlir::cast<cir::PointerType>(eltAddr.getType()).getPointee();
+      auto eltTy = eltAddr.getType().getPointee();
 
       // Classify exploded types. Keep alloca original location.
       classifyAndInitTypeCategories(eltAddr, eltTy, loc, ++nestLevel);

clang/lib/CIR/Dialect/Transforms/LoweringPrepare.cpp

@@ -1392,9 +1392,7 @@ void LoweringPreparePass::lowerArrayDtor(ArrayDtor op) {
 
   auto eltTy = op->getRegion(0).getArgument(0).getType();
   auto arrayLen =
-      mlir::cast<cir::ArrayType>(
-          mlir::cast<cir::PointerType>(op.getAddr().getType()).getPointee())
-          .getSize();
+      mlir::cast<cir::ArrayType>(op.getAddr().getType().getPointee()).getSize();
   lowerArrayDtorCtorIntoLoop(builder, op, eltTy, op.getAddr(), arrayLen);
 }
 
@@ -1458,9 +1456,7 @@ void LoweringPreparePass::lowerArrayCtor(ArrayCtor op) {
 
   auto eltTy = op->getRegion(0).getArgument(0).getType();
   auto arrayLen =
-      mlir::cast<cir::ArrayType>(
-          mlir::cast<cir::PointerType>(op.getAddr().getType()).getPointee())
-          .getSize();
+      mlir::cast<cir::ArrayType>(op.getAddr().getType().getPointee()).getSize();
   lowerArrayDtorCtorIntoLoop(builder, op, eltTy, op.getAddr(), arrayLen);
 }
 

clang/lib/CIR/Dialect/Transforms/TargetLowering/ItaniumCXXABI.cpp

@@ -324,9 +324,9 @@ void ItaniumCXXABI::lowerGetMethod(
     llvm_unreachable("ARM method ptr abi NYI");
 
   // Apply the adjustment to the 'this' pointer.
-  mlir::Type thisVoidPtrTy = cir::PointerType::get(
-      cir::VoidType::get(rewriter.getContext()),
-      mlir::cast<cir::PointerType>(op.getObject().getType()).getAddrSpace());
+  mlir::Type thisVoidPtrTy =
+      cir::PointerType::get(cir::VoidType::get(rewriter.getContext()),
+                            op.getObject().getType().getAddrSpace());
   mlir::Value thisVoidPtr = rewriter.create<cir::CastOp>(
       op.getLoc(), thisVoidPtrTy, cir::CastKind::bitcast, loweredObjectPtr);
   adjustedThis = rewriter.create<cir::PtrStrideOp>(op.getLoc(), thisVoidPtrTy,
@@ -377,8 +377,7 @@ void ItaniumCXXABI::lowerGetMethod(
     auto vtablePtrTy = cir::PointerType::get(
         cir::IntType::get(rewriter.getContext(), 8, true));
     auto vtablePtrPtrTy = cir::PointerType::get(
-        vtablePtrTy,
-        mlir::cast<cir::PointerType>(op.getObject().getType()).getAddrSpace());
+        vtablePtrTy, op.getObject().getType().getAddrSpace());
     auto vtablePtrPtr = rewriter.create<cir::CastOp>(
         op.getLoc(), vtablePtrPtrTy, cir::CastKind::bitcast, loweredObjectPtr);
     mlir::Value vtablePtr = rewriter.create<cir::LoadOp>(

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

@@ -45,6 +45,7 @@
 #include "mlir/Target/LLVMIR/Export.h"
 #include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/IR/CIROpsEnums.h"
+#include "clang/CIR/Dialect/IR/CIRTypes.h"
 #include "clang/CIR/Dialect/Passes.h"
 #include "clang/CIR/LoweringHelpers.h"
 #include "clang/CIR/MissingFeatures.h"
@@ -2319,7 +2320,7 @@ mlir::LogicalResult CIRToLLVMComplexImagOpLowering::matchAndRewrite(
 mlir::LogicalResult CIRToLLVMComplexRealPtrOpLowering::matchAndRewrite(
     cir::ComplexRealPtrOp op, OpAdaptor adaptor,
     mlir::ConversionPatternRewriter &rewriter) const {
-  auto operandTy = mlir::cast<cir::PointerType>(op.getOperand().getType());
+  cir::PointerType operandTy = op.getOperand().getType();
   auto resultLLVMTy = getTypeConverter()->convertType(op.getResult().getType());
   auto elementLLVMTy = getTypeConverter()->convertType(operandTy.getPointee());
 
@@ -2334,7 +2335,7 @@ mlir::LogicalResult CIRToLLVMComplexRealPtrOpLowering::matchAndRewrite(
 mlir::LogicalResult CIRToLLVMComplexImagPtrOpLowering::matchAndRewrite(
     cir::ComplexImagPtrOp op, OpAdaptor adaptor,
     mlir::ConversionPatternRewriter &rewriter) const {
-  auto operandTy = mlir::cast<cir::PointerType>(op.getOperand().getType());
+  cir::PointerType operandTy = op.getOperand().getType();
   auto resultLLVMTy = getTypeConverter()->convertType(op.getResult().getType());
   auto elementLLVMTy = getTypeConverter()->convertType(operandTy.getPointee());
 
@@ -3666,7 +3667,7 @@ mlir::LogicalResult CIRToLLVMPtrDiffOpLowering::matchAndRewrite(
   auto diff =
       rewriter.create<mlir::LLVM::SubOp>(op.getLoc(), llvmDstTy, lhs, rhs);
 
-  auto ptrTy = mlir::cast<cir::PointerType>(op.getLhs().getType());
+  cir::PointerType ptrTy = op.getLhs().getType();
   auto typeSize = getTypeSize(ptrTy.getPointee(), *op);
 
   // Avoid silly division by 1.