Skip to content

Commit ecc8b29

Browse files
authored
[CIR][NFC] Use actual operand name in adaptor-obtained operands (#143028)
This mirrors incubator changes from llvm/clangir#1661
1 parent 77347d6 commit ecc8b29

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
437437
switch (castOp.getKind()) {
438438
case cir::CastKind::array_to_ptrdecay: {
439439
const auto ptrTy = mlir::cast<cir::PointerType>(castOp.getType());
440-
mlir::Value sourceValue = adaptor.getOperands().front();
440+
mlir::Value sourceValue = adaptor.getSrc();
441441
mlir::Type targetType = convertTy(ptrTy);
442442
mlir::Type elementTy = convertTypeForMemory(*getTypeConverter(), dataLayout,
443443
ptrTy.getPointee());
@@ -447,7 +447,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
447447
break;
448448
}
449449
case cir::CastKind::int_to_bool: {
450-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
450+
mlir::Value llvmSrcVal = adaptor.getSrc();
451451
mlir::Value zeroInt = rewriter.create<mlir::LLVM::ConstantOp>(
452452
castOp.getLoc(), llvmSrcVal.getType(), 0);
453453
rewriter.replaceOpWithNewOp<mlir::LLVM::ICmpOp>(
@@ -457,7 +457,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
457457
case cir::CastKind::integral: {
458458
mlir::Type srcType = castOp.getSrc().getType();
459459
mlir::Type dstType = castOp.getType();
460-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
460+
mlir::Value llvmSrcVal = adaptor.getSrc();
461461
mlir::Type llvmDstType = getTypeConverter()->convertType(dstType);
462462
cir::IntType srcIntType =
463463
mlir::cast<cir::IntType>(elementTypeIfVector(srcType));
@@ -470,7 +470,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
470470
break;
471471
}
472472
case cir::CastKind::floating: {
473-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
473+
mlir::Value llvmSrcVal = adaptor.getSrc();
474474
mlir::Type llvmDstTy = getTypeConverter()->convertType(castOp.getType());
475475

476476
mlir::Type srcTy = elementTypeIfVector(castOp.getSrc().getType());
@@ -494,22 +494,22 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
494494
}
495495
case cir::CastKind::int_to_ptr: {
496496
auto dstTy = mlir::cast<cir::PointerType>(castOp.getType());
497-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
497+
mlir::Value llvmSrcVal = adaptor.getSrc();
498498
mlir::Type llvmDstTy = getTypeConverter()->convertType(dstTy);
499499
rewriter.replaceOpWithNewOp<mlir::LLVM::IntToPtrOp>(castOp, llvmDstTy,
500500
llvmSrcVal);
501501
return mlir::success();
502502
}
503503
case cir::CastKind::ptr_to_int: {
504504
auto dstTy = mlir::cast<cir::IntType>(castOp.getType());
505-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
505+
mlir::Value llvmSrcVal = adaptor.getSrc();
506506
mlir::Type llvmDstTy = getTypeConverter()->convertType(dstTy);
507507
rewriter.replaceOpWithNewOp<mlir::LLVM::PtrToIntOp>(castOp, llvmDstTy,
508508
llvmSrcVal);
509509
return mlir::success();
510510
}
511511
case cir::CastKind::float_to_bool: {
512-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
512+
mlir::Value llvmSrcVal = adaptor.getSrc();
513513
auto kind = mlir::LLVM::FCmpPredicate::une;
514514

515515
// Check if float is not equal to zero.
@@ -525,7 +525,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
525525
}
526526
case cir::CastKind::bool_to_int: {
527527
auto dstTy = mlir::cast<cir::IntType>(castOp.getType());
528-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
528+
mlir::Value llvmSrcVal = adaptor.getSrc();
529529
auto llvmSrcTy = mlir::cast<mlir::IntegerType>(llvmSrcVal.getType());
530530
auto llvmDstTy =
531531
mlir::cast<mlir::IntegerType>(getTypeConverter()->convertType(dstTy));
@@ -539,15 +539,15 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
539539
}
540540
case cir::CastKind::bool_to_float: {
541541
mlir::Type dstTy = castOp.getType();
542-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
542+
mlir::Value llvmSrcVal = adaptor.getSrc();
543543
mlir::Type llvmDstTy = getTypeConverter()->convertType(dstTy);
544544
rewriter.replaceOpWithNewOp<mlir::LLVM::UIToFPOp>(castOp, llvmDstTy,
545545
llvmSrcVal);
546546
return mlir::success();
547547
}
548548
case cir::CastKind::int_to_float: {
549549
mlir::Type dstTy = castOp.getType();
550-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
550+
mlir::Value llvmSrcVal = adaptor.getSrc();
551551
mlir::Type llvmDstTy = getTypeConverter()->convertType(dstTy);
552552
if (mlir::cast<cir::IntType>(elementTypeIfVector(castOp.getSrc().getType()))
553553
.isSigned())
@@ -560,7 +560,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
560560
}
561561
case cir::CastKind::float_to_int: {
562562
mlir::Type dstTy = castOp.getType();
563-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
563+
mlir::Value llvmSrcVal = adaptor.getSrc();
564564
mlir::Type llvmDstTy = getTypeConverter()->convertType(dstTy);
565565
if (mlir::cast<cir::IntType>(elementTypeIfVector(castOp.getType()))
566566
.isSigned())
@@ -578,13 +578,13 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
578578
assert(!MissingFeatures::cxxABI());
579579
assert(!MissingFeatures::dataMemberType());
580580

581-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
581+
mlir::Value llvmSrcVal = adaptor.getSrc();
582582
rewriter.replaceOpWithNewOp<mlir::LLVM::BitcastOp>(castOp, llvmDstTy,
583583
llvmSrcVal);
584584
return mlir::success();
585585
}
586586
case cir::CastKind::ptr_to_bool: {
587-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
587+
mlir::Value llvmSrcVal = adaptor.getSrc();
588588
mlir::Value zeroPtr = rewriter.create<mlir::LLVM::ZeroOp>(
589589
castOp.getLoc(), llvmSrcVal.getType());
590590
rewriter.replaceOpWithNewOp<mlir::LLVM::ICmpOp>(
@@ -593,7 +593,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
593593
}
594594
case cir::CastKind::address_space: {
595595
mlir::Type dstTy = castOp.getType();
596-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
596+
mlir::Value llvmSrcVal = adaptor.getSrc();
597597
mlir::Type llvmDstTy = getTypeConverter()->convertType(dstTy);
598598
rewriter.replaceOpWithNewOp<mlir::LLVM::AddrSpaceCastOp>(castOp, llvmDstTy,
599599
llvmSrcVal);

0 commit comments

Comments
 (0)