Skip to content

Commit c762c46

Browse files
committed
[CIR][NFC] Use actual operand name in adaptor-obtained operands
This mirrors incubator changes from llvm/clangir#1661
1 parent 3846d84 commit c762c46

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

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

Lines changed: 16 additions & 15 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,8 +470,9 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
470470
break;
471471
}
472472
case cir::CastKind::floating: {
473-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
474-
mlir::Type llvmDstTy = getTypeConverter()->convertType(castOp.getType());
473+
mlir::Value llvmSrcVal = adaptor.getSrc();
474+
mlir::Type llvmDstTy =
475+
getTypeConverter()->convertType(castOp.getType());
475476

476477
mlir::Type srcTy = elementTypeIfVector(castOp.getSrc().getType());
477478
mlir::Type dstTy = elementTypeIfVector(castOp.getType());
@@ -494,22 +495,22 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
494495
}
495496
case cir::CastKind::int_to_ptr: {
496497
auto dstTy = mlir::cast<cir::PointerType>(castOp.getType());
497-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
498+
mlir::Value llvmSrcVal = adaptor.getSrc();
498499
mlir::Type llvmDstTy = getTypeConverter()->convertType(dstTy);
499500
rewriter.replaceOpWithNewOp<mlir::LLVM::IntToPtrOp>(castOp, llvmDstTy,
500501
llvmSrcVal);
501502
return mlir::success();
502503
}
503504
case cir::CastKind::ptr_to_int: {
504505
auto dstTy = mlir::cast<cir::IntType>(castOp.getType());
505-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
506+
mlir::Value llvmSrcVal = adaptor.getSrc();
506507
mlir::Type llvmDstTy = getTypeConverter()->convertType(dstTy);
507508
rewriter.replaceOpWithNewOp<mlir::LLVM::PtrToIntOp>(castOp, llvmDstTy,
508509
llvmSrcVal);
509510
return mlir::success();
510511
}
511512
case cir::CastKind::float_to_bool: {
512-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
513+
mlir::Value llvmSrcVal = adaptor.getSrc();
513514
auto kind = mlir::LLVM::FCmpPredicate::une;
514515

515516
// Check if float is not equal to zero.
@@ -525,7 +526,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
525526
}
526527
case cir::CastKind::bool_to_int: {
527528
auto dstTy = mlir::cast<cir::IntType>(castOp.getType());
528-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
529+
mlir::Value llvmSrcVal = adaptor.getSrc();
529530
auto llvmSrcTy = mlir::cast<mlir::IntegerType>(llvmSrcVal.getType());
530531
auto llvmDstTy =
531532
mlir::cast<mlir::IntegerType>(getTypeConverter()->convertType(dstTy));
@@ -539,15 +540,15 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
539540
}
540541
case cir::CastKind::bool_to_float: {
541542
mlir::Type dstTy = castOp.getType();
542-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
543+
mlir::Value llvmSrcVal = adaptor.getSrc();
543544
mlir::Type llvmDstTy = getTypeConverter()->convertType(dstTy);
544545
rewriter.replaceOpWithNewOp<mlir::LLVM::UIToFPOp>(castOp, llvmDstTy,
545546
llvmSrcVal);
546547
return mlir::success();
547548
}
548549
case cir::CastKind::int_to_float: {
549550
mlir::Type dstTy = castOp.getType();
550-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
551+
mlir::Value llvmSrcVal = adaptor.getSrc();
551552
mlir::Type llvmDstTy = getTypeConverter()->convertType(dstTy);
552553
if (mlir::cast<cir::IntType>(elementTypeIfVector(castOp.getSrc().getType()))
553554
.isSigned())
@@ -560,7 +561,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
560561
}
561562
case cir::CastKind::float_to_int: {
562563
mlir::Type dstTy = castOp.getType();
563-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
564+
mlir::Value llvmSrcVal = adaptor.getSrc();
564565
mlir::Type llvmDstTy = getTypeConverter()->convertType(dstTy);
565566
if (mlir::cast<cir::IntType>(elementTypeIfVector(castOp.getType()))
566567
.isSigned())
@@ -578,13 +579,13 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
578579
assert(!MissingFeatures::cxxABI());
579580
assert(!MissingFeatures::dataMemberType());
580581

581-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
582+
mlir::Value llvmSrcVal = adaptor.getSrc();
582583
rewriter.replaceOpWithNewOp<mlir::LLVM::BitcastOp>(castOp, llvmDstTy,
583584
llvmSrcVal);
584585
return mlir::success();
585586
}
586587
case cir::CastKind::ptr_to_bool: {
587-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
588+
mlir::Value llvmSrcVal = adaptor.getSrc();
588589
mlir::Value zeroPtr = rewriter.create<mlir::LLVM::ZeroOp>(
589590
castOp.getLoc(), llvmSrcVal.getType());
590591
rewriter.replaceOpWithNewOp<mlir::LLVM::ICmpOp>(
@@ -593,7 +594,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
593594
}
594595
case cir::CastKind::address_space: {
595596
mlir::Type dstTy = castOp.getType();
596-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
597+
mlir::Value llvmSrcVal = adaptor.getSrc();
597598
mlir::Type llvmDstTy = getTypeConverter()->convertType(dstTy);
598599
rewriter.replaceOpWithNewOp<mlir::LLVM::AddrSpaceCastOp>(castOp, llvmDstTy,
599600
llvmSrcVal);

0 commit comments

Comments
 (0)