From 0db88db5d90f8d8a76360725597e0dfb82cc9661 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Sat, 7 Jan 2023 22:32:38 -0800 Subject: [PATCH] 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 --- flang/include/flang/Lower/CustomIntrinsicCall.h | 1 - flang/include/flang/Lower/IntrinsicCall.h | 1 - flang/include/flang/Lower/Runtime.h | 4 ---- flang/include/flang/Lower/SymbolMap.h | 1 - flang/include/flang/Optimizer/Builder/FIRBuilder.h | 1 - flang/lib/Lower/Mangler.cpp | 1 - flang/lib/Optimizer/Transforms/AffinePromotion.cpp | 1 - flang/lib/Optimizer/Transforms/MemRefDataFlowOpt.cpp | 1 - flang/lib/Optimizer/Transforms/SimplifyIntrinsics.cpp | 1 - 9 files changed, 12 deletions(-) diff --git a/flang/include/flang/Lower/CustomIntrinsicCall.h b/flang/include/flang/Lower/CustomIntrinsicCall.h index bb7e599..391aabd 100644 --- a/flang/include/flang/Lower/CustomIntrinsicCall.h +++ b/flang/include/flang/Lower/CustomIntrinsicCall.h @@ -25,7 +25,6 @@ #define FORTRAN_LOWER_CUSTOMINTRINSICCALL_H #include "flang/Lower/AbstractConverter.h" -#include "llvm/ADT/Optional.h" #include #include diff --git a/flang/include/flang/Lower/IntrinsicCall.h b/flang/include/flang/Lower/IntrinsicCall.h index 0d404fe..cc4b8f9 100644 --- a/flang/include/flang/Lower/IntrinsicCall.h +++ b/flang/include/flang/Lower/IntrinsicCall.h @@ -10,7 +10,6 @@ #define FORTRAN_LOWER_INTRINSICCALL_H #include "flang/Optimizer/Builder/FIRBuilder.h" -#include "llvm/ADT/Optional.h" #include namespace fir { diff --git a/flang/include/flang/Lower/Runtime.h b/flang/include/flang/Lower/Runtime.h index 1c4b98f..0c2a5fd 100644 --- a/flang/include/flang/Lower/Runtime.h +++ b/flang/include/flang/Lower/Runtime.h @@ -18,10 +18,6 @@ #include -namespace llvm { -template using Optional = std::optional; -} - namespace mlir { class Location; class Value; diff --git a/flang/include/flang/Lower/SymbolMap.h b/flang/include/flang/Lower/SymbolMap.h index f65e551..f6aa586 100644 --- a/flang/include/flang/Lower/SymbolMap.h +++ b/flang/include/flang/Lower/SymbolMap.h @@ -22,7 +22,6 @@ #include "mlir/IR/Value.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/DenseMap.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/SmallVector.h" #include "llvm/Support/Compiler.h" #include diff --git a/flang/include/flang/Optimizer/Builder/FIRBuilder.h b/flang/include/flang/Optimizer/Builder/FIRBuilder.h index 682b457..5d1f855 100644 --- a/flang/include/flang/Optimizer/Builder/FIRBuilder.h +++ b/flang/include/flang/Optimizer/Builder/FIRBuilder.h @@ -24,7 +24,6 @@ #include "mlir/IR/Builders.h" #include "mlir/IR/BuiltinOps.h" #include "llvm/ADT/DenseMap.h" -#include "llvm/ADT/Optional.h" #include namespace fir { diff --git a/flang/lib/Lower/Mangler.cpp b/flang/lib/Lower/Mangler.cpp index b4030a0..e0bc7b1 100644 --- a/flang/lib/Lower/Mangler.cpp +++ b/flang/lib/Lower/Mangler.cpp @@ -14,7 +14,6 @@ #include "flang/Optimizer/Support/InternalNames.h" #include "flang/Semantics/tools.h" #include "llvm/ADT/ArrayRef.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringRef.h" #include "llvm/ADT/Twine.h" diff --git a/flang/lib/Optimizer/Transforms/AffinePromotion.cpp b/flang/lib/Optimizer/Transforms/AffinePromotion.cpp index 9fde565..321a078 100644 --- a/flang/lib/Optimizer/Transforms/AffinePromotion.cpp +++ b/flang/lib/Optimizer/Transforms/AffinePromotion.cpp @@ -27,7 +27,6 @@ #include "mlir/IR/Visitors.h" #include "mlir/Transforms/DialectConversion.h" #include "llvm/ADT/DenseMap.h" -#include "llvm/ADT/Optional.h" #include "llvm/Support/Debug.h" #include diff --git a/flang/lib/Optimizer/Transforms/MemRefDataFlowOpt.cpp b/flang/lib/Optimizer/Transforms/MemRefDataFlowOpt.cpp index 9aad370..cf65453 100644 --- a/flang/lib/Optimizer/Transforms/MemRefDataFlowOpt.cpp +++ b/flang/lib/Optimizer/Transforms/MemRefDataFlowOpt.cpp @@ -14,7 +14,6 @@ #include "mlir/IR/Dominance.h" #include "mlir/IR/Operation.h" #include "mlir/Transforms/Passes.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallVector.h" #include diff --git a/flang/lib/Optimizer/Transforms/SimplifyIntrinsics.cpp b/flang/lib/Optimizer/Transforms/SimplifyIntrinsics.cpp index 05ddcfe..25f161c 100644 --- a/flang/lib/Optimizer/Transforms/SimplifyIntrinsics.cpp +++ b/flang/lib/Optimizer/Transforms/SimplifyIntrinsics.cpp @@ -37,7 +37,6 @@ #include "mlir/Transforms/DialectConversion.h" #include "mlir/Transforms/GreedyPatternRewriteDriver.h" #include "mlir/Transforms/RegionUtils.h" -#include "llvm/ADT/Optional.h" #include "llvm/Support/Debug.h" #include "llvm/Support/raw_ostream.h" #include -- 2.7.4