diff options
| author | Ramkumar Ramachandra <r@artagnon.com> | 2022-12-19 14:25:14 +0100 |
|---|---|---|
| committer | Ramkumar Ramachandra <r@artagnon.com> | 2022-12-19 18:48:59 +0100 |
| commit | 0de16fafa57153a70168d69ca8591dbe8489905f (patch) | |
| tree | 92e6a51e9141c707616f16af73b3f3a6b22fd291 /mlir/unittests | |
| parent | 2f6439bcf9bda13a80adb4b7f6c587d2d44fbb2e (diff) | |
| download | llvm-0de16fafa57153a70168d69ca8591dbe8489905f.tar.gz | |
mlir/DialectConversion: use std::optional (NFC)
This is part of an effort to migrate from llvm::Optional to
std::optional. This patch touches DialectConversion, and modifies
existing conversions and tests appropriately.
See also: https://discourse.llvm.org/t/deprecating-llvm-optional-x-hasvalue-getvalue-getvalueor/63716
Signed-off-by: Ramkumar Ramachandra <r@artagnon.com>
Differential Revision: https://reviews.llvm.org/D140303
Diffstat (limited to 'mlir/unittests')
| -rw-r--r-- | mlir/unittests/Transforms/DialectConversion.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/mlir/unittests/Transforms/DialectConversion.cpp b/mlir/unittests/Transforms/DialectConversion.cpp index 0cac2975ea91..f4a60af82d12 100644 --- a/mlir/unittests/Transforms/DialectConversion.cpp +++ b/mlir/unittests/Transforms/DialectConversion.cpp @@ -37,10 +37,11 @@ TEST(DialectConversionTest, DynamicallyLegalOpCallbackOrder) { }); int callbackCalled2 = 0; - target.addDynamicallyLegalOp<DummyOp>([&](Operation *) -> Optional<bool> { - callbackCalled2 = ++index; - return std::nullopt; - }); + target.addDynamicallyLegalOp<DummyOp>( + [&](Operation *) -> std::optional<bool> { + callbackCalled2 = ++index; + return std::nullopt; + }); auto *op = createOp(&context); EXPECT_TRUE(target.isLegal(op)); @@ -58,10 +59,11 @@ TEST(DialectConversionTest, DynamicallyLegalOpCallbackSkip) { int index = 0; int callbackCalled = 0; - target.addDynamicallyLegalOp<DummyOp>([&](Operation *) -> Optional<bool> { - callbackCalled = ++index; - return std::nullopt; - }); + target.addDynamicallyLegalOp<DummyOp>( + [&](Operation *) -> std::optional<bool> { + callbackCalled = ++index; + return std::nullopt; + }); auto *op = createOp(&context); EXPECT_FALSE(target.isLegal(op)); @@ -83,7 +85,7 @@ TEST(DialectConversionTest, DynamicallyLegalUnknownOpCallbackOrder) { }); int callbackCalled2 = 0; - target.markUnknownOpDynamicallyLegal([&](Operation *) -> Optional<bool> { + target.markUnknownOpDynamicallyLegal([&](Operation *) -> std::optional<bool> { callbackCalled2 = ++index; return std::nullopt; }); @@ -103,7 +105,7 @@ TEST(DialectConversionTest, DynamicallyLegalReturnNone) { ConversionTarget target(context); target.addDynamicallyLegalOp<DummyOp>( - [&](Operation *) -> Optional<bool> { return std::nullopt; }); + [&](Operation *) -> std::optional<bool> { return std::nullopt; }); auto *op = createOp(&context); EXPECT_FALSE(target.isLegal(op)); @@ -120,7 +122,7 @@ TEST(DialectConversionTest, DynamicallyLegalUnknownReturnNone) { ConversionTarget target(context); target.markUnknownOpDynamicallyLegal( - [&](Operation *) -> Optional<bool> { return std::nullopt; }); + [&](Operation *) -> std::optional<bool> { return std::nullopt; }); auto *op = createOp(&context); EXPECT_FALSE(target.isLegal(op)); |