From 2140260d9154ea3b7dd905b72805004dd182b1a3 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Sat, 14 Jan 2023 01:34:49 -0800 Subject: [PATCH] [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 --- mlir/examples/toy/Ch1/include/toy/Parser.h | 1 - mlir/examples/toy/Ch2/include/toy/Parser.h | 1 - mlir/examples/toy/Ch3/include/toy/Parser.h | 1 - mlir/examples/toy/Ch4/include/toy/Parser.h | 1 - mlir/examples/toy/Ch5/include/toy/Parser.h | 1 - mlir/examples/toy/Ch6/include/toy/Parser.h | 1 - mlir/examples/toy/Ch7/include/toy/Parser.h | 1 - mlir/include/mlir/Analysis/Presburger/Simplex.h | 1 - mlir/include/mlir/Bindings/Python/PybindAdaptors.h | 1 - mlir/include/mlir/Dialect/Affine/Analysis/AffineAnalysis.h | 1 - mlir/include/mlir/Dialect/Affine/Analysis/LoopAnalysis.h | 1 - mlir/include/mlir/ExecutionEngine/MemRefUtils.h | 1 - mlir/include/mlir/Pass/PassManager.h | 1 - mlir/include/mlir/Support/LogicalResult.h | 1 - mlir/lib/Analysis/Presburger/Simplex.cpp | 1 - mlir/lib/AsmParser/Token.h | 1 - mlir/lib/Bindings/Python/Globals.h | 1 - mlir/lib/Bindings/Python/IRAttributes.cpp | 1 - mlir/lib/Bindings/Python/IRModule.h | 1 - mlir/lib/Bindings/Python/PybindUtils.h | 1 - mlir/lib/Tools/lsp-server-support/Protocol.h | 1 - mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-yaml-gen.cpp | 1 - 22 files changed, 22 deletions(-) diff --git a/mlir/examples/toy/Ch1/include/toy/Parser.h b/mlir/examples/toy/Ch1/include/toy/Parser.h index 9b0906d..1f20616 100644 --- a/mlir/examples/toy/Ch1/include/toy/Parser.h +++ b/mlir/examples/toy/Ch1/include/toy/Parser.h @@ -17,7 +17,6 @@ #include "toy/AST.h" #include "toy/Lexer.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/raw_ostream.h" diff --git a/mlir/examples/toy/Ch2/include/toy/Parser.h b/mlir/examples/toy/Ch2/include/toy/Parser.h index 9b0906d..1f20616 100644 --- a/mlir/examples/toy/Ch2/include/toy/Parser.h +++ b/mlir/examples/toy/Ch2/include/toy/Parser.h @@ -17,7 +17,6 @@ #include "toy/AST.h" #include "toy/Lexer.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/raw_ostream.h" diff --git a/mlir/examples/toy/Ch3/include/toy/Parser.h b/mlir/examples/toy/Ch3/include/toy/Parser.h index 9b0906d..1f20616 100644 --- a/mlir/examples/toy/Ch3/include/toy/Parser.h +++ b/mlir/examples/toy/Ch3/include/toy/Parser.h @@ -17,7 +17,6 @@ #include "toy/AST.h" #include "toy/Lexer.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/raw_ostream.h" diff --git a/mlir/examples/toy/Ch4/include/toy/Parser.h b/mlir/examples/toy/Ch4/include/toy/Parser.h index 9b0906d..1f20616 100644 --- a/mlir/examples/toy/Ch4/include/toy/Parser.h +++ b/mlir/examples/toy/Ch4/include/toy/Parser.h @@ -17,7 +17,6 @@ #include "toy/AST.h" #include "toy/Lexer.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/raw_ostream.h" diff --git a/mlir/examples/toy/Ch5/include/toy/Parser.h b/mlir/examples/toy/Ch5/include/toy/Parser.h index 9b0906d..1f20616 100644 --- a/mlir/examples/toy/Ch5/include/toy/Parser.h +++ b/mlir/examples/toy/Ch5/include/toy/Parser.h @@ -17,7 +17,6 @@ #include "toy/AST.h" #include "toy/Lexer.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/raw_ostream.h" diff --git a/mlir/examples/toy/Ch6/include/toy/Parser.h b/mlir/examples/toy/Ch6/include/toy/Parser.h index 9b0906d..1f20616 100644 --- a/mlir/examples/toy/Ch6/include/toy/Parser.h +++ b/mlir/examples/toy/Ch6/include/toy/Parser.h @@ -17,7 +17,6 @@ #include "toy/AST.h" #include "toy/Lexer.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/raw_ostream.h" diff --git a/mlir/examples/toy/Ch7/include/toy/Parser.h b/mlir/examples/toy/Ch7/include/toy/Parser.h index abfd2f5..7ba7b8f 100644 --- a/mlir/examples/toy/Ch7/include/toy/Parser.h +++ b/mlir/examples/toy/Ch7/include/toy/Parser.h @@ -17,7 +17,6 @@ #include "toy/AST.h" #include "toy/Lexer.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/raw_ostream.h" diff --git a/mlir/include/mlir/Analysis/Presburger/Simplex.h b/mlir/include/mlir/Analysis/Presburger/Simplex.h index 5a562da..470d483 100644 --- a/mlir/include/mlir/Analysis/Presburger/Simplex.h +++ b/mlir/include/mlir/Analysis/Presburger/Simplex.h @@ -22,7 +22,6 @@ #include "mlir/Analysis/Presburger/Utils.h" #include "mlir/Support/LogicalResult.h" #include "llvm/ADT/ArrayRef.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/SmallBitVector.h" #include "llvm/ADT/SmallVector.h" #include "llvm/Support/StringSaver.h" diff --git a/mlir/include/mlir/Bindings/Python/PybindAdaptors.h b/mlir/include/mlir/Bindings/Python/PybindAdaptors.h index 38c5470..98d80f0 100644 --- a/mlir/include/mlir/Bindings/Python/PybindAdaptors.h +++ b/mlir/include/mlir/Bindings/Python/PybindAdaptors.h @@ -25,7 +25,6 @@ #include "mlir-c/Bindings/Python/Interop.h" #include "mlir-c/IR.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/Twine.h" namespace py = pybind11; diff --git a/mlir/include/mlir/Dialect/Affine/Analysis/AffineAnalysis.h b/mlir/include/mlir/Dialect/Affine/Analysis/AffineAnalysis.h index b19315e..5f728516 100644 --- a/mlir/include/mlir/Dialect/Affine/Analysis/AffineAnalysis.h +++ b/mlir/include/mlir/Dialect/Affine/Analysis/AffineAnalysis.h @@ -17,7 +17,6 @@ #include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/IR/Value.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/SmallVector.h" #include diff --git a/mlir/include/mlir/Dialect/Affine/Analysis/LoopAnalysis.h b/mlir/include/mlir/Dialect/Affine/Analysis/LoopAnalysis.h index d0ac1a2..07c0157 100644 --- a/mlir/include/mlir/Dialect/Affine/Analysis/LoopAnalysis.h +++ b/mlir/include/mlir/Dialect/Affine/Analysis/LoopAnalysis.h @@ -15,7 +15,6 @@ #include "mlir/Support/LLVM.h" #include "llvm/ADT/ArrayRef.h" -#include "llvm/ADT/Optional.h" #include namespace mlir { diff --git a/mlir/include/mlir/ExecutionEngine/MemRefUtils.h b/mlir/include/mlir/ExecutionEngine/MemRefUtils.h index bba002f..55369c7 100644 --- a/mlir/include/mlir/ExecutionEngine/MemRefUtils.h +++ b/mlir/include/mlir/ExecutionEngine/MemRefUtils.h @@ -17,7 +17,6 @@ #include "mlir/ExecutionEngine/CRunnerUtils.h" #include "mlir/Support/LLVM.h" #include "llvm/ADT/ArrayRef.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/STLExtras.h" #include "llvm/Support/raw_ostream.h" diff --git a/mlir/include/mlir/Pass/PassManager.h b/mlir/include/mlir/Pass/PassManager.h index 62dc532..a2b1d97 100644 --- a/mlir/include/mlir/Pass/PassManager.h +++ b/mlir/include/mlir/Pass/PassManager.h @@ -13,7 +13,6 @@ #include "mlir/IR/OperationSupport.h" #include "mlir/Support/LogicalResult.h" #include "mlir/Support/Timing.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/iterator.h" #include "llvm/Support/raw_ostream.h" diff --git a/mlir/include/mlir/Support/LogicalResult.h b/mlir/include/mlir/Support/LogicalResult.h index ebb1464..7ee7046 100644 --- a/mlir/include/mlir/Support/LogicalResult.h +++ b/mlir/include/mlir/Support/LogicalResult.h @@ -10,7 +10,6 @@ #define MLIR_SUPPORT_LOGICALRESULT_H #include "mlir/Support/LLVM.h" -#include "llvm/ADT/Optional.h" #include namespace mlir { diff --git a/mlir/lib/Analysis/Presburger/Simplex.cpp b/mlir/lib/Analysis/Presburger/Simplex.cpp index 228f041..61c39bd 100644 --- a/mlir/lib/Analysis/Presburger/Simplex.cpp +++ b/mlir/lib/Analysis/Presburger/Simplex.cpp @@ -9,7 +9,6 @@ #include "mlir/Analysis/Presburger/Simplex.h" #include "mlir/Analysis/Presburger/Matrix.h" #include "mlir/Support/MathExtras.h" -#include "llvm/ADT/Optional.h" #include "llvm/Support/Compiler.h" #include #include diff --git a/mlir/lib/AsmParser/Token.h b/mlir/lib/AsmParser/Token.h index 4640e038..9cae80f 100644 --- a/mlir/lib/AsmParser/Token.h +++ b/mlir/lib/AsmParser/Token.h @@ -10,7 +10,6 @@ #define MLIR_LIB_PARSER_TOKEN_H #include "mlir/Support/LLVM.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/SMLoc.h" #include diff --git a/mlir/lib/Bindings/Python/Globals.h b/mlir/lib/Bindings/Python/Globals.h index f3370a4..8caa5a0 100644 --- a/mlir/lib/Bindings/Python/Globals.h +++ b/mlir/lib/Bindings/Python/Globals.h @@ -15,7 +15,6 @@ #include "PybindUtils.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringSet.h" diff --git a/mlir/lib/Bindings/Python/IRAttributes.cpp b/mlir/lib/Bindings/Python/IRAttributes.cpp index a29f163..c8ede8b 100644 --- a/mlir/lib/Bindings/Python/IRAttributes.cpp +++ b/mlir/lib/Bindings/Python/IRAttributes.cpp @@ -20,7 +20,6 @@ namespace py = pybind11; using namespace mlir; using namespace mlir::python; -using llvm::Optional; using llvm::SmallVector; using llvm::Twine; diff --git a/mlir/lib/Bindings/Python/IRModule.h b/mlir/lib/Bindings/Python/IRModule.h index d26fa20..37115ac 100644 --- a/mlir/lib/Bindings/Python/IRModule.h +++ b/mlir/lib/Bindings/Python/IRModule.h @@ -21,7 +21,6 @@ #include "mlir-c/IR.h" #include "mlir-c/IntegerSet.h" #include "llvm/ADT/DenseMap.h" -#include "llvm/ADT/Optional.h" namespace mlir { namespace python { diff --git a/mlir/lib/Bindings/Python/PybindUtils.h b/mlir/lib/Bindings/Python/PybindUtils.h index 245dc46..2d8bbc1 100644 --- a/mlir/lib/Bindings/Python/PybindUtils.h +++ b/mlir/lib/Bindings/Python/PybindUtils.h @@ -10,7 +10,6 @@ #define MLIR_BINDINGS_PYTHON_PYBINDUTILS_H #include "mlir-c/Support.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/Twine.h" #include "llvm/Support/DataTypes.h" diff --git a/mlir/lib/Tools/lsp-server-support/Protocol.h b/mlir/lib/Tools/lsp-server-support/Protocol.h index 3112e9f..8818a37 100644 --- a/mlir/lib/Tools/lsp-server-support/Protocol.h +++ b/mlir/lib/Tools/lsp-server-support/Protocol.h @@ -24,7 +24,6 @@ #define LIB_MLIR_TOOLS_LSPSERVERSUPPORT_PROTOCOL_H_ #include "mlir/Support/LLVM.h" -#include "llvm/ADT/Optional.h" #include "llvm/Support/JSON.h" #include "llvm/Support/SourceMgr.h" #include "llvm/Support/raw_ostream.h" diff --git a/mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-yaml-gen.cpp b/mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-yaml-gen.cpp index fdb5c2a..a51bdb5 100644 --- a/mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-yaml-gen.cpp +++ b/mlir/tools/mlir-linalg-ods-gen/mlir-linalg-ods-yaml-gen.cpp @@ -20,7 +20,6 @@ #include "mlir/IR/MLIRContext.h" #include "mlir/Support/FileUtilities.h" #include "mlir/Support/LLVM.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" -- 2.7.4