Skip to content

Commit dc97886

Browse files
[flang] Restore Optional::value() (NFC)
This patch restores several calls to Optional::value() in preference to Optional::operator*. The Flang C++ Style Guide tells us to use x.value() where no presence test is obviously protecting a *x reference to the contents. Differential Revision: https://reviews.llvm.org/D128590
1 parent 066043c commit dc97886

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

flang/lib/Lower/ConvertExpr.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3950,8 +3950,9 @@ class ArrayExprLowering {
39503950
mlir::Value oldInnerArg = modifyOp.getSequence();
39513951
std::size_t offset = explicitSpace->argPosition(oldInnerArg);
39523952
explicitSpace->setInnerArg(offset, fir::getBase(lexv));
3953-
fir::ExtendedValue exv = arrayModifyToExv(
3954-
builder, loc, *explicitSpace->getLhsLoad(0), modifyOp.getResult(0));
3953+
fir::ExtendedValue exv =
3954+
arrayModifyToExv(builder, loc, explicitSpace->getLhsLoad(0).value(),
3955+
modifyOp.getResult(0));
39553956
genScalarUserDefinedAssignmentCall(builder, loc, userAssignment, exv,
39563957
elementalExv);
39573958
} else {
@@ -4101,7 +4102,7 @@ class ArrayExprLowering {
41014102
mlir::Value origVal) {
41024103
mlir::Value val = builder.createConvert(loc, eleTy, origVal);
41034104
if (isBoundsSpec()) {
4104-
auto lbs = *lbounds;
4105+
auto lbs = lbounds.value();
41054106
if (lbs.size() > 0) {
41064107
// Rebox the value with user-specified shift.
41074108
auto shiftTy = fir::ShiftType::get(eleTy.getContext(), lbs.size());
@@ -6368,7 +6369,7 @@ class ArrayExprLowering {
63686369
charLen = builder.createTemporary(loc, builder.getI64Type());
63696370
mlir::Value castLen =
63706371
builder.createConvert(loc, builder.getI64Type(), fir::getLen(exv));
6371-
builder.create<fir::StoreOp>(loc, castLen, *charLen);
6372+
builder.create<fir::StoreOp>(loc, castLen, charLen.value());
63726373
}
63736374
}
63746375
stmtCtx.finalize(/*popScope=*/true);
@@ -6382,7 +6383,7 @@ class ArrayExprLowering {
63826383

63836384
// Convert to extended value.
63846385
if (fir::isa_char(seqTy.getEleTy())) {
6385-
auto len = builder.create<fir::LoadOp>(loc, *charLen);
6386+
auto len = builder.create<fir::LoadOp>(loc, charLen.value());
63866387
return {fir::CharArrayBoxValue{mem, len, extents}, /*needCopy=*/false};
63876388
}
63886389
return {fir::ArrayBoxValue{mem, extents}, /*needCopy=*/false};
@@ -6450,7 +6451,7 @@ class ArrayExprLowering {
64506451
charLen = builder.createTemporary(loc, builder.getI64Type());
64516452
mlir::Value castLen =
64526453
builder.createConvert(loc, builder.getI64Type(), fir::getLen(exv));
6453-
builder.create<fir::StoreOp>(loc, castLen, *charLen);
6454+
builder.create<fir::StoreOp>(loc, castLen, charLen.value());
64546455
}
64556456
}
64566457
mem = builder.createConvert(loc, fir::HeapType::get(resTy), mem);

flang/lib/Optimizer/CodeGen/CodeGen.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2818,7 +2818,7 @@ struct SelectCaseOpConversion : public FIROpConversion<fir::SelectCaseOp> {
28182818
caseOp.getSuccessorOperands(adaptor.getOperands(), t);
28192819
llvm::Optional<mlir::ValueRange> cmpOps =
28202820
*caseOp.getCompareOperands(adaptor.getOperands(), t);
2821-
mlir::Value caseArg = *(cmpOps->begin());
2821+
mlir::Value caseArg = *(cmpOps.value().begin());
28222822
mlir::Attribute attr = cases[t];
28232823
if (attr.isa<fir::PointIntervalAttr>()) {
28242824
auto cmp = rewriter.create<mlir::LLVM::ICmpOp>(
@@ -2847,7 +2847,7 @@ struct SelectCaseOpConversion : public FIROpConversion<fir::SelectCaseOp> {
28472847
rewriter.setInsertionPointToEnd(thisBlock);
28482848
rewriter.create<mlir::LLVM::CondBrOp>(loc, cmp, newBlock1, newBlock2);
28492849
rewriter.setInsertionPointToEnd(newBlock1);
2850-
mlir::Value caseArg0 = *(cmpOps->begin() + 1);
2850+
mlir::Value caseArg0 = *(cmpOps.value().begin() + 1);
28512851
auto cmp0 = rewriter.create<mlir::LLVM::ICmpOp>(
28522852
loc, mlir::LLVM::ICmpPredicate::sle, selector, caseArg0);
28532853
genCondBrOp(loc, cmp0, dest, destOps, rewriter, newBlock2);

0 commit comments

Comments
 (0)