Skip to content

Commit

Permalink
[flang] Use value instead of getValue (NFC)
Browse files Browse the repository at this point in the history
Flang C++ Style Guide tells us to use x.value() when no presence test
is obviously protecting the reference.  Since assert can be disabled,
I don't count it as "protection" here.

Differential Revision: https://reviews.llvm.org/D130144
  • Loading branch information
kazutakahirata committed Jul 20, 2022
1 parent 1a73ef7 commit 993625b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion flang/include/flang/Lower/IterationSpace.h
Expand Up @@ -475,7 +475,7 @@ class ExplicitIterSpace {
/// Return the outermost loop in this FORALL nest.
fir::DoLoopOp getOuterLoop() {
assert(outerLoop.has_value());
return outerLoop.getValue();
return outerLoop.value();
}

/// Return the statement context for the entire, outermost FORALL construct.
Expand Down
4 changes: 2 additions & 2 deletions flang/lib/Lower/CustomIntrinsicCall.cpp
Expand Up @@ -194,12 +194,12 @@ lowerIshftc(fir::FirOpBuilder &builder, mlir::Location loc,
isPresentCheck(2) &&
"only ISHFTC SIZE arg is expected to be dynamically optional here");
assert(retTy && "ISFHTC must have a return type");
mlir::Type resultType = retTy.getValue();
mlir::Type resultType = retTy.value();
llvm::SmallVector<fir::ExtendedValue> args;
args.push_back(getOperand(0));
args.push_back(getOperand(1));
args.push_back(builder
.genIfOp(loc, {resultType}, isPresentCheck(2).getValue(),
.genIfOp(loc, {resultType}, isPresentCheck(2).value(),
/*withElseRegion=*/true)
.genThen([&]() {
fir::ExtendedValue sizeExv = getOperand(2);
Expand Down
4 changes: 2 additions & 2 deletions flang/lib/Optimizer/Dialect/FIROps.cpp
Expand Up @@ -750,7 +750,7 @@ static void printCmpOp(mlir::OpAsmPrinter &p, OPTY op) {
OPTY::getPredicateAttrName())
.getInt());
assert(predSym.has_value() && "invalid symbol value for predicate");
p << '"' << mlir::arith::stringifyCmpFPredicate(predSym.getValue()) << '"'
p << '"' << mlir::arith::stringifyCmpFPredicate(predSym.value()) << '"'
<< ", ";
p.printOperand(op.getLhs());
p << ", ";
Expand Down Expand Up @@ -809,7 +809,7 @@ mlir::arith::CmpFPredicate
fir::CmpcOp::getPredicateByName(llvm::StringRef name) {
auto pred = mlir::arith::symbolizeCmpFPredicate(name);
assert(pred.has_value() && "invalid predicate name");
return pred.getValue();
return pred.value();
}

void fir::CmpcOp::print(mlir::OpAsmPrinter &p) { printCmpOp(p, *this); }
Expand Down

0 comments on commit 993625b

Please sign in to comment.