Skip to content

Commit 99a25aa

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

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
@@ -405,7 +405,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
405405
switch (castOp.getKind()) {
406406
case cir::CastKind::array_to_ptrdecay: {
407407
const auto ptrTy = mlir::cast<cir::PointerType>(castOp.getType());
408-
mlir::Value sourceValue = adaptor.getOperands().front();
408+
mlir::Value sourceValue = adaptor.getSrc();
409409
mlir::Type targetType = convertTy(ptrTy);
410410
mlir::Type elementTy = convertTypeForMemory(*getTypeConverter(), dataLayout,
411411
ptrTy.getPointee());
@@ -415,7 +415,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
415415
break;
416416
}
417417
case cir::CastKind::int_to_bool: {
418-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
418+
mlir::Value llvmSrcVal = adaptor.getSrc();
419419
mlir::Value zeroInt = rewriter.create<mlir::LLVM::ConstantOp>(
420420
castOp.getLoc(), llvmSrcVal.getType(), 0);
421421
rewriter.replaceOpWithNewOp<mlir::LLVM::ICmpOp>(
@@ -425,7 +425,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
425425
case cir::CastKind::integral: {
426426
mlir::Type srcType = castOp.getSrc().getType();
427427
mlir::Type dstType = castOp.getResult().getType();
428-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
428+
mlir::Value llvmSrcVal = adaptor.getSrc();
429429
mlir::Type llvmDstType = getTypeConverter()->convertType(dstType);
430430
cir::IntType srcIntType =
431431
mlir::cast<cir::IntType>(elementTypeIfVector(srcType));
@@ -438,7 +438,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
438438
break;
439439
}
440440
case cir::CastKind::floating: {
441-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
441+
mlir::Value llvmSrcVal = adaptor.getSrc();
442442
mlir::Type llvmDstTy =
443443
getTypeConverter()->convertType(castOp.getResult().getType());
444444

@@ -463,22 +463,22 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
463463
}
464464
case cir::CastKind::int_to_ptr: {
465465
auto dstTy = mlir::cast<cir::PointerType>(castOp.getType());
466-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
466+
mlir::Value llvmSrcVal = adaptor.getSrc();
467467
mlir::Type llvmDstTy = getTypeConverter()->convertType(dstTy);
468468
rewriter.replaceOpWithNewOp<mlir::LLVM::IntToPtrOp>(castOp, llvmDstTy,
469469
llvmSrcVal);
470470
return mlir::success();
471471
}
472472
case cir::CastKind::ptr_to_int: {
473473
auto dstTy = mlir::cast<cir::IntType>(castOp.getType());
474-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
474+
mlir::Value llvmSrcVal = adaptor.getSrc();
475475
mlir::Type llvmDstTy = getTypeConverter()->convertType(dstTy);
476476
rewriter.replaceOpWithNewOp<mlir::LLVM::PtrToIntOp>(castOp, llvmDstTy,
477477
llvmSrcVal);
478478
return mlir::success();
479479
}
480480
case cir::CastKind::float_to_bool: {
481-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
481+
mlir::Value llvmSrcVal = adaptor.getSrc();
482482
auto kind = mlir::LLVM::FCmpPredicate::une;
483483

484484
// Check if float is not equal to zero.
@@ -494,7 +494,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
494494
}
495495
case cir::CastKind::bool_to_int: {
496496
auto dstTy = mlir::cast<cir::IntType>(castOp.getType());
497-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
497+
mlir::Value llvmSrcVal = adaptor.getSrc();
498498
auto llvmSrcTy = mlir::cast<mlir::IntegerType>(llvmSrcVal.getType());
499499
auto llvmDstTy =
500500
mlir::cast<mlir::IntegerType>(getTypeConverter()->convertType(dstTy));
@@ -508,15 +508,15 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
508508
}
509509
case cir::CastKind::bool_to_float: {
510510
mlir::Type dstTy = castOp.getType();
511-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
511+
mlir::Value llvmSrcVal = adaptor.getSrc();
512512
mlir::Type llvmDstTy = getTypeConverter()->convertType(dstTy);
513513
rewriter.replaceOpWithNewOp<mlir::LLVM::UIToFPOp>(castOp, llvmDstTy,
514514
llvmSrcVal);
515515
return mlir::success();
516516
}
517517
case cir::CastKind::int_to_float: {
518518
mlir::Type dstTy = castOp.getType();
519-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
519+
mlir::Value llvmSrcVal = adaptor.getSrc();
520520
mlir::Type llvmDstTy = getTypeConverter()->convertType(dstTy);
521521
if (mlir::cast<cir::IntType>(elementTypeIfVector(castOp.getSrc().getType()))
522522
.isSigned())
@@ -529,7 +529,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
529529
}
530530
case cir::CastKind::float_to_int: {
531531
mlir::Type dstTy = castOp.getType();
532-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
532+
mlir::Value llvmSrcVal = adaptor.getSrc();
533533
mlir::Type llvmDstTy = getTypeConverter()->convertType(dstTy);
534534
if (mlir::cast<cir::IntType>(
535535
elementTypeIfVector(castOp.getResult().getType()))
@@ -548,13 +548,13 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
548548
assert(!MissingFeatures::cxxABI());
549549
assert(!MissingFeatures::dataMemberType());
550550

551-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
551+
mlir::Value llvmSrcVal = adaptor.getSrc();
552552
rewriter.replaceOpWithNewOp<mlir::LLVM::BitcastOp>(castOp, llvmDstTy,
553553
llvmSrcVal);
554554
return mlir::success();
555555
}
556556
case cir::CastKind::ptr_to_bool: {
557-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
557+
mlir::Value llvmSrcVal = adaptor.getSrc();
558558
mlir::Value zeroPtr = rewriter.create<mlir::LLVM::ZeroOp>(
559559
castOp.getLoc(), llvmSrcVal.getType());
560560
rewriter.replaceOpWithNewOp<mlir::LLVM::ICmpOp>(
@@ -563,7 +563,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
563563
}
564564
case cir::CastKind::address_space: {
565565
mlir::Type dstTy = castOp.getType();
566-
mlir::Value llvmSrcVal = adaptor.getOperands().front();
566+
mlir::Value llvmSrcVal = adaptor.getSrc();
567567
mlir::Type llvmDstTy = getTypeConverter()->convertType(dstTy);
568568
rewriter.replaceOpWithNewOp<mlir::LLVM::AddrSpaceCastOp>(castOp, llvmDstTy,
569569
llvmSrcVal);

0 commit comments

Comments
 (0)