Skip to content

Commit 0db88db

Browse files
flang] Remove remaining uses of llvm::Optional (NFC)
This patch removes the unused "using" declaration and removes #include "llvm/ADT/Optional.h". 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 c092158 commit 0db88db

File tree

9 files changed

+0
-12
lines changed

9 files changed

+0
-12
lines changed

flang/include/flang/Lower/CustomIntrinsicCall.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#define FORTRAN_LOWER_CUSTOMINTRINSICCALL_H
2626

2727
#include "flang/Lower/AbstractConverter.h"
28-
#include "llvm/ADT/Optional.h"
2928
#include <functional>
3029
#include <optional>
3130

flang/include/flang/Lower/IntrinsicCall.h

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

1212
#include "flang/Optimizer/Builder/FIRBuilder.h"
13-
#include "llvm/ADT/Optional.h"
1413
#include <optional>
1514

1615
namespace fir {

flang/include/flang/Lower/Runtime.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818

1919
#include <optional>
2020

21-
namespace llvm {
22-
template <typename T> using Optional = std::optional<T>;
23-
}
24-
2521
namespace mlir {
2622
class Location;
2723
class Value;

flang/include/flang/Lower/SymbolMap.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "mlir/IR/Value.h"
2323
#include "llvm/ADT/ArrayRef.h"
2424
#include "llvm/ADT/DenseMap.h"
25-
#include "llvm/ADT/Optional.h"
2625
#include "llvm/ADT/SmallVector.h"
2726
#include "llvm/Support/Compiler.h"
2827
#include <optional>

flang/include/flang/Optimizer/Builder/FIRBuilder.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "mlir/IR/Builders.h"
2525
#include "mlir/IR/BuiltinOps.h"
2626
#include "llvm/ADT/DenseMap.h"
27-
#include "llvm/ADT/Optional.h"
2827
#include <optional>
2928

3029
namespace fir {

flang/lib/Lower/Mangler.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include "flang/Optimizer/Support/InternalNames.h"
1515
#include "flang/Semantics/tools.h"
1616
#include "llvm/ADT/ArrayRef.h"
17-
#include "llvm/ADT/Optional.h"
1817
#include "llvm/ADT/SmallVector.h"
1918
#include "llvm/ADT/StringRef.h"
2019
#include "llvm/ADT/Twine.h"

flang/lib/Optimizer/Transforms/AffinePromotion.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "mlir/IR/Visitors.h"
2828
#include "mlir/Transforms/DialectConversion.h"
2929
#include "llvm/ADT/DenseMap.h"
30-
#include "llvm/ADT/Optional.h"
3130
#include "llvm/Support/Debug.h"
3231
#include <optional>
3332

flang/lib/Optimizer/Transforms/MemRefDataFlowOpt.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include "mlir/IR/Dominance.h"
1515
#include "mlir/IR/Operation.h"
1616
#include "mlir/Transforms/Passes.h"
17-
#include "llvm/ADT/Optional.h"
1817
#include "llvm/ADT/STLExtras.h"
1918
#include "llvm/ADT/SmallVector.h"
2019
#include <optional>

flang/lib/Optimizer/Transforms/SimplifyIntrinsics.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#include "mlir/Transforms/DialectConversion.h"
3838
#include "mlir/Transforms/GreedyPatternRewriteDriver.h"
3939
#include "mlir/Transforms/RegionUtils.h"
40-
#include "llvm/ADT/Optional.h"
4140
#include "llvm/Support/Debug.h"
4241
#include "llvm/Support/raw_ostream.h"
4342
#include <optional>

0 commit comments

Comments
 (0)