Skip to content

Commit 815658c

Browse files
xlaukolanza
xlauko
authored and
lanza
committed
[CIR][NFC] Use actual operand name in adaptor-obtained operands (llvm#1661)
1 parent 65a378e commit 815658c

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,7 +1160,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
11601160
switch (castOp.getKind()) {
11611161
case cir::CastKind::array_to_ptrdecay: {
11621162
const auto ptrTy = mlir::cast<cir::PointerType>(castOp.getType());
1163-
auto sourceValue = adaptor.getOperands().front();
1163+
auto sourceValue = adaptor.getSrc();
11641164
auto targetType = convertTy(ptrTy);
11651165
auto elementTy = convertTypeForMemory(*getTypeConverter(), dataLayout,
11661166
ptrTy.getPointee());
@@ -1180,7 +1180,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
11801180
case cir::CastKind::integral: {
11811181
auto srcType = castOp.getSrc().getType();
11821182
auto dstType = castOp.getResult().getType();
1183-
auto llvmSrcVal = adaptor.getOperands().front();
1183+
auto llvmSrcVal = adaptor.getSrc();
11841184
auto llvmDstType = getTypeConverter()->convertType(dstType);
11851185
cir::IntType srcIntType =
11861186
mlir::cast<cir::IntType>(elementTypeIfVector(srcType));
@@ -1193,7 +1193,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
11931193
break;
11941194
}
11951195
case cir::CastKind::floating: {
1196-
auto llvmSrcVal = adaptor.getOperands().front();
1196+
auto llvmSrcVal = adaptor.getSrc();
11971197
auto llvmDstTy =
11981198
getTypeConverter()->convertType(castOp.getResult().getType());
11991199

@@ -1218,22 +1218,22 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
12181218
}
12191219
case cir::CastKind::int_to_ptr: {
12201220
auto dstTy = mlir::cast<cir::PointerType>(castOp.getType());
1221-
auto llvmSrcVal = adaptor.getOperands().front();
1221+
auto llvmSrcVal = adaptor.getSrc();
12221222
auto llvmDstTy = getTypeConverter()->convertType(dstTy);
12231223
rewriter.replaceOpWithNewOp<mlir::LLVM::IntToPtrOp>(castOp, llvmDstTy,
12241224
llvmSrcVal);
12251225
return mlir::success();
12261226
}
12271227
case cir::CastKind::ptr_to_int: {
12281228
auto dstTy = mlir::cast<cir::IntType>(castOp.getType());
1229-
auto llvmSrcVal = adaptor.getOperands().front();
1229+
auto llvmSrcVal = adaptor.getSrc();
12301230
auto llvmDstTy = getTypeConverter()->convertType(dstTy);
12311231
rewriter.replaceOpWithNewOp<mlir::LLVM::PtrToIntOp>(castOp, llvmDstTy,
12321232
llvmSrcVal);
12331233
return mlir::success();
12341234
}
12351235
case cir::CastKind::float_to_bool: {
1236-
auto llvmSrcVal = adaptor.getOperands().front();
1236+
auto llvmSrcVal = adaptor.getSrc();
12371237
auto kind = mlir::LLVM::FCmpPredicate::une;
12381238

12391239
// Check if float is not equal to zero.
@@ -1249,7 +1249,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
12491249
}
12501250
case cir::CastKind::bool_to_int: {
12511251
auto dstTy = mlir::cast<cir::IntType>(castOp.getType());
1252-
auto llvmSrcVal = adaptor.getOperands().front();
1252+
auto llvmSrcVal = adaptor.getSrc();
12531253
auto llvmSrcTy = mlir::cast<mlir::IntegerType>(llvmSrcVal.getType());
12541254
auto llvmDstTy =
12551255
mlir::cast<mlir::IntegerType>(getTypeConverter()->convertType(dstTy));
@@ -1263,15 +1263,15 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
12631263
}
12641264
case cir::CastKind::bool_to_float: {
12651265
auto dstTy = castOp.getType();
1266-
auto llvmSrcVal = adaptor.getOperands().front();
1266+
auto llvmSrcVal = adaptor.getSrc();
12671267
auto llvmDstTy = getTypeConverter()->convertType(dstTy);
12681268
rewriter.replaceOpWithNewOp<mlir::LLVM::UIToFPOp>(castOp, llvmDstTy,
12691269
llvmSrcVal);
12701270
return mlir::success();
12711271
}
12721272
case cir::CastKind::int_to_float: {
12731273
auto dstTy = castOp.getType();
1274-
auto llvmSrcVal = adaptor.getOperands().front();
1274+
auto llvmSrcVal = adaptor.getSrc();
12751275
auto llvmDstTy = getTypeConverter()->convertType(dstTy);
12761276
if (mlir::cast<cir::IntType>(elementTypeIfVector(castOp.getSrc().getType()))
12771277
.isSigned())
@@ -1284,7 +1284,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
12841284
}
12851285
case cir::CastKind::float_to_int: {
12861286
auto dstTy = castOp.getType();
1287-
auto llvmSrcVal = adaptor.getOperands().front();
1287+
auto llvmSrcVal = adaptor.getSrc();
12881288
auto llvmDstTy = getTypeConverter()->convertType(dstTy);
12891289
if (mlir::cast<cir::IntType>(
12901290
elementTypeIfVector(castOp.getResult().getType()))
@@ -1313,7 +1313,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
13131313
return mlir::success();
13141314
}
13151315

1316-
auto llvmSrcVal = adaptor.getOperands().front();
1316+
auto llvmSrcVal = adaptor.getSrc();
13171317
rewriter.replaceOpWithNewOp<mlir::LLVM::BitcastOp>(castOp, llvmDstTy,
13181318
llvmSrcVal);
13191319
return mlir::success();
@@ -1329,7 +1329,7 @@ mlir::LogicalResult CIRToLLVMCastOpLowering::matchAndRewrite(
13291329
}
13301330
case cir::CastKind::address_space: {
13311331
auto dstTy = castOp.getType();
1332-
auto llvmSrcVal = adaptor.getOperands().front();
1332+
auto llvmSrcVal = adaptor.getSrc();
13331333
auto llvmDstTy = getTypeConverter()->convertType(dstTy);
13341334
rewriter.replaceOpWithNewOp<mlir::LLVM::AddrSpaceCastOp>(castOp, llvmDstTy,
13351335
llvmSrcVal);
@@ -2059,8 +2059,8 @@ mlir::LogicalResult CIRToLLVMVAStartOpLowering::matchAndRewrite(
20592059
cir::VAStartOp op, OpAdaptor adaptor,
20602060
mlir::ConversionPatternRewriter &rewriter) const {
20612061
auto opaquePtr = mlir::LLVM::LLVMPointerType::get(getContext());
2062-
auto vaList = rewriter.create<mlir::LLVM::BitcastOp>(
2063-
op.getLoc(), opaquePtr, adaptor.getOperands().front());
2062+
auto vaList = rewriter.create<mlir::LLVM::BitcastOp>(op.getLoc(), opaquePtr,
2063+
adaptor.getArgList());
20642064
rewriter.replaceOpWithNewOp<mlir::LLVM::VaStartOp>(op, vaList);
20652065
return mlir::success();
20662066
}
@@ -2069,8 +2069,8 @@ mlir::LogicalResult CIRToLLVMVAEndOpLowering::matchAndRewrite(
20692069
cir::VAEndOp op, OpAdaptor adaptor,
20702070
mlir::ConversionPatternRewriter &rewriter) const {
20712071
auto opaquePtr = mlir::LLVM::LLVMPointerType::get(getContext());
2072-
auto vaList = rewriter.create<mlir::LLVM::BitcastOp>(
2073-
op.getLoc(), opaquePtr, adaptor.getOperands().front());
2072+
auto vaList = rewriter.create<mlir::LLVM::BitcastOp>(op.getLoc(), opaquePtr,
2073+
adaptor.getArgList());
20742074
rewriter.replaceOpWithNewOp<mlir::LLVM::VaEndOp>(op, vaList);
20752075
return mlir::success();
20762076
}
@@ -2079,10 +2079,10 @@ mlir::LogicalResult CIRToLLVMVACopyOpLowering::matchAndRewrite(
20792079
cir::VACopyOp op, OpAdaptor adaptor,
20802080
mlir::ConversionPatternRewriter &rewriter) const {
20812081
auto opaquePtr = mlir::LLVM::LLVMPointerType::get(getContext());
2082-
auto dstList = rewriter.create<mlir::LLVM::BitcastOp>(
2083-
op.getLoc(), opaquePtr, adaptor.getOperands().front());
2084-
auto srcList = rewriter.create<mlir::LLVM::BitcastOp>(
2085-
op.getLoc(), opaquePtr, adaptor.getOperands().back());
2082+
auto dstList = rewriter.create<mlir::LLVM::BitcastOp>(op.getLoc(), opaquePtr,
2083+
adaptor.getDstList());
2084+
auto srcList = rewriter.create<mlir::LLVM::BitcastOp>(op.getLoc(), opaquePtr,
2085+
adaptor.getSrcList());
20862086
rewriter.replaceOpWithNewOp<mlir::LLVM::VaCopyOp>(op, dstList, srcList);
20872087
return mlir::success();
20882088
}

0 commit comments

Comments
 (0)