diff options
author | Kazu Hirata <kazu@google.com> | 2022-07-11 20:41:12 -0700 |
---|---|---|
committer | Kazu Hirata <kazu@google.com> | 2022-07-11 20:41:12 -0700 |
commit | c82fb16f580c80b961cb1971df66ce70eaf7d87a (patch) | |
tree | 942a4b409c8f53ddb314ca190f1d4aecb19dc017 /flang/lib | |
parent | ec9a0e36d9d3182b63c5b556beca6d9e397e73f1 (diff) | |
download | llvm-c82fb16f580c80b961cb1971df66ce70eaf7d87a.zip llvm-c82fb16f580c80b961cb1971df66ce70eaf7d87a.tar.gz llvm-c82fb16f580c80b961cb1971df66ce70eaf7d87a.tar.bz2 |
[flang] Use has_value instead of hasValue (NFC)
This patch replaces hasValue with has_value in an effort to deprecate
Optional<X>::hasValue.
Differential Revision: https://reviews.llvm.org/D129458
Diffstat (limited to 'flang/lib')
-rw-r--r-- | flang/lib/Lower/ConvertExpr.cpp | 6 | ||||
-rw-r--r-- | flang/lib/Lower/IterationSpace.cpp | 2 | ||||
-rw-r--r-- | flang/lib/Optimizer/CodeGen/CodeGen.cpp | 2 | ||||
-rw-r--r-- | flang/lib/Optimizer/Dialect/FIROps.cpp | 6 | ||||
-rw-r--r-- | flang/lib/Optimizer/Transforms/AffinePromotion.cpp | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/flang/lib/Lower/ConvertExpr.cpp b/flang/lib/Lower/ConvertExpr.cpp index 0351df2..5fe5314 100644 --- a/flang/lib/Lower/ConvertExpr.cpp +++ b/flang/lib/Lower/ConvertExpr.cpp @@ -7291,14 +7291,14 @@ private: void setUnordered(bool b) { unordered = b; } - inline bool isPointerAssignment() const { return lbounds.hasValue(); } + inline bool isPointerAssignment() const { return lbounds.has_value(); } inline bool isBoundsSpec() const { - return isPointerAssignment() && !ubounds.hasValue(); + return isPointerAssignment() && !ubounds.has_value(); } inline bool isBoundsRemap() const { - return isPointerAssignment() && ubounds.hasValue(); + return isPointerAssignment() && ubounds.has_value(); } void setPointerAssignmentBounds( diff --git a/flang/lib/Lower/IterationSpace.cpp b/flang/lib/Lower/IterationSpace.cpp index f41bc51..e282563 100644 --- a/flang/lib/Lower/IterationSpace.cpp +++ b/flang/lib/Lower/IterationSpace.cpp @@ -867,7 +867,7 @@ Fortran::lower::ExplicitIterSpace::findArgPosition(fir::ArrayLoadOp load) { llvm::Optional<size_t> optPos; if (ld != loadBindings.end() && ld->second == load) optPos = static_cast<size_t>(0u); - assert(optPos.hasValue() && "load does not correspond to lhs"); + assert(optPos.has_value() && "load does not correspond to lhs"); return optPos; } return llvm::None; diff --git a/flang/lib/Optimizer/CodeGen/CodeGen.cpp b/flang/lib/Optimizer/CodeGen/CodeGen.cpp index 632ab28..f9f6f93 100644 --- a/flang/lib/Optimizer/CodeGen/CodeGen.cpp +++ b/flang/lib/Optimizer/CodeGen/CodeGen.cpp @@ -2635,7 +2635,7 @@ struct GlobalOpConversion : public FIROpConversion<fir::GlobalOp> { if (global.getInitVal()) initAttr = global.getInitVal().getValue(); auto linkage = convertLinkage(global.getLinkName()); - auto isConst = global.getConstant().hasValue(); + auto isConst = global.getConstant().has_value(); auto g = rewriter.create<mlir::LLVM::GlobalOp>( loc, tyAttr, isConst, linkage, global.getSymName(), initAttr); auto &gr = g.getInitializerRegion(); diff --git a/flang/lib/Optimizer/Dialect/FIROps.cpp b/flang/lib/Optimizer/Dialect/FIROps.cpp index 0119bca..8337b16 100644 --- a/flang/lib/Optimizer/Dialect/FIROps.cpp +++ b/flang/lib/Optimizer/Dialect/FIROps.cpp @@ -647,7 +647,7 @@ mlir::FunctionType fir::CallOp::getFunctionType() { } void fir::CallOp::print(mlir::OpAsmPrinter &p) { - bool isDirect = getCallee().hasValue(); + bool isDirect = getCallee().has_value(); p << ' '; if (isDirect) p << getCallee().getValue(); @@ -749,7 +749,7 @@ static void printCmpOp(mlir::OpAsmPrinter &p, OPTY op) { op->template getAttrOfType<mlir::IntegerAttr>( OPTY::getPredicateAttrName()) .getInt()); - assert(predSym.hasValue() && "invalid symbol value for predicate"); + assert(predSym.has_value() && "invalid symbol value for predicate"); p << '"' << mlir::arith::stringifyCmpFPredicate(predSym.getValue()) << '"' << ", "; p.printOperand(op.getLhs()); @@ -808,7 +808,7 @@ void fir::buildCmpCOp(mlir::OpBuilder &builder, mlir::OperationState &result, mlir::arith::CmpFPredicate fir::CmpcOp::getPredicateByName(llvm::StringRef name) { auto pred = mlir::arith::symbolizeCmpFPredicate(name); - assert(pred.hasValue() && "invalid predicate name"); + assert(pred.has_value() && "invalid predicate name"); return pred.getValue(); } diff --git a/flang/lib/Optimizer/Transforms/AffinePromotion.cpp b/flang/lib/Optimizer/Transforms/AffinePromotion.cpp index dad4b47..e9f017c 100644 --- a/flang/lib/Optimizer/Transforms/AffinePromotion.cpp +++ b/flang/lib/Optimizer/Transforms/AffinePromotion.cpp @@ -171,7 +171,7 @@ struct AffineIfCondition { fromCmpIOp(condDef); } - bool hasIntegerSet() const { return integerSet.hasValue(); } + bool hasIntegerSet() const { return integerSet.has_value(); } mlir::IntegerSet getIntegerSet() const { assert(hasIntegerSet() && "integer set is missing"); |