Skip to content

Commit ce295bd

Browse files
committed
[flang] Update builder.create<T> to T::create
1 parent 9978426 commit ce295bd

File tree

2 files changed

+22
-23
lines changed

2 files changed

+22
-23
lines changed

flang/lib/Optimizer/Builder/IntrinsicCall.cpp

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3684,14 +3684,13 @@ void IntrinsicLibrary::genCoBroadcast(llvm::ArrayRef<fir::ExtendedValue> args) {
36843684
mlir::Value sourceImage = fir::getBase(args[1]);
36853685
mlir::Value status =
36863686
isStaticallyAbsent(args[2])
3687-
? builder
3688-
.create<fir::AbsentOp>(loc,
3689-
builder.getRefType(builder.getI32Type()))
3687+
? fir::AbsentOp::create(builder, loc,
3688+
builder.getRefType(builder.getI32Type()))
36903689
.getResult()
36913690
: fir::getBase(args[2]);
36923691
mlir::Value errmsg =
36933692
isStaticallyAbsent(args[3])
3694-
? builder.create<fir::AbsentOp>(loc, PRIF_ERRMSG_TYPE).getResult()
3693+
? fir::AbsentOp::create(builder, loc, PRIF_ERRMSG_TYPE).getResult()
36953694
: fir::getBase(args[3]);
36963695
fir::runtime::genCoBroadcast(builder, loc, fir::getBase(args[0]), sourceImage,
36973696
status, errmsg);
@@ -3702,16 +3701,16 @@ void IntrinsicLibrary::genCoMax(llvm::ArrayRef<fir::ExtendedValue> args) {
37023701
checkCoarrayEnabled();
37033702
assert(args.size() == 4);
37043703
mlir::Value refNone =
3705-
builder
3706-
.create<fir::AbsentOp>(loc, builder.getRefType(builder.getI32Type()))
3704+
fir::AbsentOp::create(builder, loc,
3705+
builder.getRefType(builder.getI32Type()))
37073706
.getResult();
37083707
mlir::Value resultImage =
37093708
isStaticallyAbsent(args[1]) ? refNone : fir::getBase(args[1]);
37103709
mlir::Value status =
37113710
isStaticallyAbsent(args[2]) ? refNone : fir::getBase(args[2]);
37123711
mlir::Value errmsg =
37133712
isStaticallyAbsent(args[3])
3714-
? builder.create<fir::AbsentOp>(loc, PRIF_ERRMSG_TYPE).getResult()
3713+
? fir::AbsentOp::create(builder, loc, PRIF_ERRMSG_TYPE).getResult()
37153714
: fir::getBase(args[3]);
37163715
fir::runtime::genCoMax(builder, loc, fir::getBase(args[0]), resultImage,
37173716
status, errmsg);
@@ -3722,16 +3721,16 @@ void IntrinsicLibrary::genCoMin(llvm::ArrayRef<fir::ExtendedValue> args) {
37223721
checkCoarrayEnabled();
37233722
assert(args.size() == 4);
37243723
mlir::Value refNone =
3725-
builder
3726-
.create<fir::AbsentOp>(loc, builder.getRefType(builder.getI32Type()))
3724+
fir::AbsentOp::create(builder, loc,
3725+
builder.getRefType(builder.getI32Type()))
37273726
.getResult();
37283727
mlir::Value resultImage =
37293728
isStaticallyAbsent(args[1]) ? refNone : fir::getBase(args[1]);
37303729
mlir::Value status =
37313730
isStaticallyAbsent(args[2]) ? refNone : fir::getBase(args[2]);
37323731
mlir::Value errmsg =
37333732
isStaticallyAbsent(args[3])
3734-
? builder.create<fir::AbsentOp>(loc, PRIF_ERRMSG_TYPE).getResult()
3733+
? fir::AbsentOp::create(builder, loc, PRIF_ERRMSG_TYPE).getResult()
37353734
: fir::getBase(args[3]);
37363735
fir::runtime::genCoMin(builder, loc, fir::getBase(args[0]), resultImage,
37373736
status, errmsg);
@@ -3742,16 +3741,16 @@ void IntrinsicLibrary::genCoSum(llvm::ArrayRef<fir::ExtendedValue> args) {
37423741
checkCoarrayEnabled();
37433742
assert(args.size() == 4);
37443743
mlir::Value absentInt =
3745-
builder
3746-
.create<fir::AbsentOp>(loc, builder.getRefType(builder.getI32Type()))
3744+
fir::AbsentOp::create(builder, loc,
3745+
builder.getRefType(builder.getI32Type()))
37473746
.getResult();
37483747
mlir::Value resultImage =
37493748
isStaticallyAbsent(args[1]) ? absentInt : fir::getBase(args[1]);
37503749
mlir::Value status =
37513750
isStaticallyAbsent(args[2]) ? absentInt : fir::getBase(args[2]);
37523751
mlir::Value errmsg =
37533752
isStaticallyAbsent(args[3])
3754-
? builder.create<fir::AbsentOp>(loc, PRIF_ERRMSG_TYPE).getResult()
3753+
? fir::AbsentOp::create(builder, loc, PRIF_ERRMSG_TYPE).getResult()
37553754
: fir::getBase(args[3]);
37563755
fir::runtime::genCoSum(builder, loc, fir::getBase(args[0]), resultImage,
37573756
status, errmsg);

flang/lib/Optimizer/Builder/Runtime/Coarray.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ genErrmsgPRIF(fir::FirOpBuilder &builder, mlir::Location loc,
2626
mlir::Value errmsg) {
2727
bool isAllocatableErrmsg = fir::isAllocatableType(errmsg.getType());
2828

29-
mlir::Value absent = builder.create<fir::AbsentOp>(loc, PRIF_ERRMSG_TYPE);
29+
mlir::Value absent = fir::AbsentOp::create(builder, loc, PRIF_ERRMSG_TYPE);
3030
mlir::Value errMsg = isAllocatableErrmsg ? absent : errmsg;
3131
mlir::Value errMsgAlloc = isAllocatableErrmsg ? errmsg : absent;
3232
return {errMsg, errMsgAlloc};
@@ -42,8 +42,8 @@ mlir::Value fir::runtime::genInitCoarray(fir::FirOpBuilder &builder,
4242
builder.createFunction(loc, PRIFNAME_SUB("init"), ftype);
4343
llvm::SmallVector<mlir::Value> args =
4444
fir::runtime::createArguments(builder, loc, ftype, result);
45-
builder.create<fir::CallOp>(loc, funcOp, args);
46-
return builder.create<fir::LoadOp>(loc, result);
45+
fir::CallOp::create(builder, loc, funcOp, args);
46+
return fir::LoadOp::create(builder, loc, result);
4747
}
4848

4949
/// Generate Call to runtime prif_num_images
@@ -56,8 +56,8 @@ mlir::Value fir::runtime::getNumImages(fir::FirOpBuilder &builder,
5656
builder.createFunction(loc, PRIFNAME_SUB("num_images"), ftype);
5757
llvm::SmallVector<mlir::Value> args =
5858
fir::runtime::createArguments(builder, loc, ftype, result);
59-
builder.create<fir::CallOp>(loc, funcOp, args);
60-
return builder.create<fir::LoadOp>(loc, result);
59+
fir::CallOp::create(builder, loc, funcOp, args);
60+
return fir::LoadOp::create(builder, loc, result);
6161
}
6262

6363
/// Generate Call to runtime prif_num_images_with_{team|team_number}
@@ -81,8 +81,8 @@ mlir::Value fir::runtime::getNumImagesWithTeam(fir::FirOpBuilder &builder,
8181
team = builder.createBox(loc, team);
8282
llvm::SmallVector<mlir::Value> args =
8383
fir::runtime::createArguments(builder, loc, ftype, team, result);
84-
builder.create<fir::CallOp>(loc, funcOp, args);
85-
return builder.create<fir::LoadOp>(loc, result);
84+
fir::CallOp::create(builder, loc, funcOp, args);
85+
return fir::LoadOp::create(builder, loc, result);
8686
}
8787

8888
/// Generate Call to runtime prif_this_image_no_coarray
@@ -96,11 +96,11 @@ mlir::Value fir::runtime::getThisImage(fir::FirOpBuilder &builder,
9696

9797
mlir::Value result = builder.createTemporary(loc, builder.getI32Type());
9898
mlir::Value teamArg =
99-
!team ? builder.create<fir::AbsentOp>(loc, boxTy) : team;
99+
!team ? fir::AbsentOp::create(builder, loc, boxTy) : team;
100100
llvm::SmallVector<mlir::Value> args =
101101
fir::runtime::createArguments(builder, loc, ftype, teamArg, result);
102-
builder.create<fir::CallOp>(loc, funcOp, args);
103-
return builder.create<fir::LoadOp>(loc, result);
102+
fir::CallOp::create(builder, loc, funcOp, args);
103+
return fir::LoadOp::create(builder, loc, result);
104104
}
105105

106106
/// Generate call to collective subroutines except co_reduce

0 commit comments

Comments
 (0)