Skip to content

Commit 2140260

Browse files
[mlir] Remove remaining uses of llvm::Optional (NFC)
This patch removes one "using" declaration and #include "llvm/ADT/Optional.h". It keeps several "using" declarations in headers for downstream users. This is part of an effort to migrate from llvm::Optional to std::optional: https://discourse.llvm.org/t/deprecating-llvm-optional-x-hasvalue-getvalue-getvalueor/63716
1 parent 0a81ace commit 2140260

File tree

22 files changed

+0
-22
lines changed

22 files changed

+0
-22
lines changed

mlir/examples/toy/Ch1/include/toy/Parser.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "toy/AST.h"
1818
#include "toy/Lexer.h"
1919

20-
#include "llvm/ADT/Optional.h"
2120
#include "llvm/ADT/STLExtras.h"
2221
#include "llvm/ADT/StringExtras.h"
2322
#include "llvm/Support/raw_ostream.h"

mlir/examples/toy/Ch2/include/toy/Parser.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "toy/AST.h"
1818
#include "toy/Lexer.h"
1919

20-
#include "llvm/ADT/Optional.h"
2120
#include "llvm/ADT/STLExtras.h"
2221
#include "llvm/ADT/StringExtras.h"
2322
#include "llvm/Support/raw_ostream.h"

mlir/examples/toy/Ch3/include/toy/Parser.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "toy/AST.h"
1818
#include "toy/Lexer.h"
1919

20-
#include "llvm/ADT/Optional.h"
2120
#include "llvm/ADT/STLExtras.h"
2221
#include "llvm/ADT/StringExtras.h"
2322
#include "llvm/Support/raw_ostream.h"

mlir/examples/toy/Ch4/include/toy/Parser.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "toy/AST.h"
1818
#include "toy/Lexer.h"
1919

20-
#include "llvm/ADT/Optional.h"
2120
#include "llvm/ADT/STLExtras.h"
2221
#include "llvm/ADT/StringExtras.h"
2322
#include "llvm/Support/raw_ostream.h"

mlir/examples/toy/Ch5/include/toy/Parser.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "toy/AST.h"
1818
#include "toy/Lexer.h"
1919

20-
#include "llvm/ADT/Optional.h"
2120
#include "llvm/ADT/STLExtras.h"
2221
#include "llvm/ADT/StringExtras.h"
2322
#include "llvm/Support/raw_ostream.h"

mlir/examples/toy/Ch6/include/toy/Parser.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "toy/AST.h"
1818
#include "toy/Lexer.h"
1919

20-
#include "llvm/ADT/Optional.h"
2120
#include "llvm/ADT/STLExtras.h"
2221
#include "llvm/ADT/StringExtras.h"
2322
#include "llvm/Support/raw_ostream.h"

mlir/examples/toy/Ch7/include/toy/Parser.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "toy/AST.h"
1818
#include "toy/Lexer.h"
1919

20-
#include "llvm/ADT/Optional.h"
2120
#include "llvm/ADT/STLExtras.h"
2221
#include "llvm/ADT/StringExtras.h"
2322
#include "llvm/Support/raw_ostream.h"

mlir/include/mlir/Analysis/Presburger/Simplex.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "mlir/Analysis/Presburger/Utils.h"
2323
#include "mlir/Support/LogicalResult.h"
2424
#include "llvm/ADT/ArrayRef.h"
25-
#include "llvm/ADT/Optional.h"
2625
#include "llvm/ADT/SmallBitVector.h"
2726
#include "llvm/ADT/SmallVector.h"
2827
#include "llvm/Support/StringSaver.h"

mlir/include/mlir/Bindings/Python/PybindAdaptors.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "mlir-c/Bindings/Python/Interop.h"
2626
#include "mlir-c/IR.h"
2727

28-
#include "llvm/ADT/Optional.h"
2928
#include "llvm/ADT/Twine.h"
3029

3130
namespace py = pybind11;

mlir/include/mlir/Dialect/Affine/Analysis/AffineAnalysis.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
#include "mlir/Dialect/Arith/IR/Arith.h"
1919
#include "mlir/IR/Value.h"
20-
#include "llvm/ADT/Optional.h"
2120
#include "llvm/ADT/SmallVector.h"
2221
#include <optional>
2322

mlir/include/mlir/Dialect/Affine/Analysis/LoopAnalysis.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
#include "mlir/Support/LLVM.h"
1717
#include "llvm/ADT/ArrayRef.h"
18-
#include "llvm/ADT/Optional.h"
1918
#include <optional>
2019

2120
namespace mlir {

mlir/include/mlir/ExecutionEngine/MemRefUtils.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "mlir/ExecutionEngine/CRunnerUtils.h"
1818
#include "mlir/Support/LLVM.h"
1919
#include "llvm/ADT/ArrayRef.h"
20-
#include "llvm/ADT/Optional.h"
2120
#include "llvm/ADT/STLExtras.h"
2221

2322
#include "llvm/Support/raw_ostream.h"

mlir/include/mlir/Pass/PassManager.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "mlir/IR/OperationSupport.h"
1414
#include "mlir/Support/LogicalResult.h"
1515
#include "mlir/Support/Timing.h"
16-
#include "llvm/ADT/Optional.h"
1716
#include "llvm/ADT/SmallVector.h"
1817
#include "llvm/ADT/iterator.h"
1918
#include "llvm/Support/raw_ostream.h"

mlir/include/mlir/Support/LogicalResult.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#define MLIR_SUPPORT_LOGICALRESULT_H
1111

1212
#include "mlir/Support/LLVM.h"
13-
#include "llvm/ADT/Optional.h"
1413
#include <optional>
1514

1615
namespace mlir {

mlir/lib/Analysis/Presburger/Simplex.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "mlir/Analysis/Presburger/Simplex.h"
1010
#include "mlir/Analysis/Presburger/Matrix.h"
1111
#include "mlir/Support/MathExtras.h"
12-
#include "llvm/ADT/Optional.h"
1312
#include "llvm/Support/Compiler.h"
1413
#include <numeric>
1514
#include <optional>

mlir/lib/AsmParser/Token.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#define MLIR_LIB_PARSER_TOKEN_H
1111

1212
#include "mlir/Support/LLVM.h"
13-
#include "llvm/ADT/Optional.h"
1413
#include "llvm/ADT/StringRef.h"
1514
#include "llvm/Support/SMLoc.h"
1615
#include <optional>

mlir/lib/Bindings/Python/Globals.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
#include "PybindUtils.h"
1717

18-
#include "llvm/ADT/Optional.h"
1918
#include "llvm/ADT/StringRef.h"
2019
#include "llvm/ADT/StringSet.h"
2120

mlir/lib/Bindings/Python/IRAttributes.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ namespace py = pybind11;
2020
using namespace mlir;
2121
using namespace mlir::python;
2222

23-
using llvm::Optional;
2423
using llvm::SmallVector;
2524
using llvm::Twine;
2625

mlir/lib/Bindings/Python/IRModule.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "mlir-c/IR.h"
2222
#include "mlir-c/IntegerSet.h"
2323
#include "llvm/ADT/DenseMap.h"
24-
#include "llvm/ADT/Optional.h"
2524

2625
namespace mlir {
2726
namespace python {

mlir/lib/Bindings/Python/PybindUtils.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#define MLIR_BINDINGS_PYTHON_PYBINDUTILS_H
1111

1212
#include "mlir-c/Support.h"
13-
#include "llvm/ADT/Optional.h"
1413
#include "llvm/ADT/Twine.h"
1514
#include "llvm/Support/DataTypes.h"
1615

mlir/lib/Tools/lsp-server-support/Protocol.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#define LIB_MLIR_TOOLS_LSPSERVERSUPPORT_PROTOCOL_H_
2525

2626
#include "mlir/Support/LLVM.h"
27-
#include "llvm/ADT/Optional.h"
2827
#include "llvm/Support/JSON.h"
2928
#include "llvm/Support/SourceMgr.h"
3029
#include "llvm/Support/raw_ostream.h"

mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-yaml-gen.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "mlir/IR/MLIRContext.h"
2121
#include "mlir/Support/FileUtilities.h"
2222
#include "mlir/Support/LLVM.h"
23-
#include "llvm/ADT/Optional.h"
2423
#include "llvm/ADT/StringRef.h"
2524
#include "llvm/Support/CommandLine.h"
2625
#include "llvm/Support/Debug.h"

0 commit comments

Comments
 (0)