Skip to content

Commit c57c5f5

Browse files
[flang] Fix warnings
This patch fixes: flang/../mlir/include/mlir/IR/TypeRange.h:51:19: error: 'ArrayRef' is deprecated: Use {} or ArrayRef<T>() instead [-Werror,-Wdeprecated-declarations] flang/../mlir/include/mlir/IR/ValueRange.h:401:20: error: 'ArrayRef' is deprecated: Use {} or ArrayRef<T>() instead [-Werror,-Wdeprecated-declarations]
1 parent 303bc0d commit c57c5f5

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

flang/include/flang/Optimizer/Builder/IntrinsicCall.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ static inline mlir::FunctionType genFuncType(mlir::MLIRContext *context,
753753
}
754754

755755
if (TyR::ty == ParamTypeId::Void)
756-
return mlir::FunctionType::get(context, argTypes, std::nullopt);
756+
return mlir::FunctionType::get(context, argTypes, {});
757757

758758
auto resType = getTypeHelper(context, builder, TyR::ty, TyR::kind);
759759
return mlir::FunctionType::get(context, argTypes, {resType});

flang/lib/Optimizer/Builder/IntrinsicCall.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5150,9 +5150,9 @@ void IntrinsicLibrary::genIeeeGetOrSetModesOrStatus(
51505150
isModes ? fir::runtime::genGetModesTypeSize(builder, loc)
51515151
: fir::runtime::genGetStatusTypeSize(builder, loc);
51525152
byteSize = builder.createConvert(loc, builder.getIndexType(), byteSize);
5153-
addr =
5154-
builder.create<fir::AllocMemOp>(loc, extractSequenceType(heapTy),
5155-
/*typeparams=*/std::nullopt, byteSize);
5153+
addr = builder.create<fir::AllocMemOp>(loc, extractSequenceType(heapTy),
5154+
/*typeparams=*/mlir::ValueRange(),
5155+
byteSize);
51565156
mlir::Value shape = builder.create<fir::ShapeOp>(loc, byteSize);
51575157
builder.create<fir::StoreOp>(
51585158
loc, builder.create<fir::EmboxOp>(loc, fieldTy, addr, shape), fieldRef);

flang/lib/Optimizer/Builder/PPCIntrinsicCall.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2888,8 +2888,7 @@ void PPCIntrinsicLibrary::genVecStore(llvm::ArrayRef<fir::ExtendedValue> args) {
28882888
llvm_unreachable("invalid vector operation for generator");
28892889
}
28902890

2891-
auto funcType{
2892-
mlir::FunctionType::get(context, {stTy, addr.getType()}, std::nullopt)};
2891+
auto funcType{mlir::FunctionType::get(context, {stTy, addr.getType()}, {})};
28932892
mlir::func::FuncOp funcOp = builder.createFunction(loc, fname, funcType);
28942893

28952894
llvm::SmallVector<mlir::Value, 4> biArgs;

0 commit comments

Comments
 (0)