[clang-tools-extra] f7dffc2 - Don't include None.h (NFC)
Kazu Hirata via cfe-commits
cfe-commits at lists.llvm.org
Sat Dec 10 17:38:37 PST 2022
Hi Douglas,
I just checked in:
13f489e75077a49aa3b44a369eeb1e1b3998691a
Kazu Hirata
On Sat, Dec 10, 2022 at 5:34 PM Kazu Hirata <kazu at google.com> wrote:
> Hi Douglas,
>
> I'll take a look.
>
> Kazu Hirata
>
>
> On Sat, Dec 10, 2022 at 5:26 PM Yung, Douglas <douglas.yung at sony.com>
> wrote:
>
>> Hi Kazu,
>>
>> Your change caused the build of cross-project-tests to fail, can you take
>> a look?
>>
>> https://lab.llvm.org/buildbot/#/builders/139/builds/32528
>> https://lab.llvm.org/buildbot/#/builders/216/builds/14213
>>
>> Douglas Yung
>>
>> -----Original Message-----
>> From: cfe-commits <cfe-commits-bounces at lists.llvm.org> On Behalf Of Kazu
>> Hirata via cfe-commits
>> Sent: Saturday, December 10, 2022 11:25
>> To: cfe-commits at lists.llvm.org
>> Subject: [clang-tools-extra] f7dffc2 - Don't include None.h (NFC)
>>
>>
>> Author: Kazu Hirata
>> Date: 2022-12-10T11:24:26-08:00
>> New Revision: f7dffc28b3f82e25a0e283d2b11ffb9c6a129340
>>
>> URL:
>> https://urldefense.com/v3/__https://github.com/llvm/llvm-project/commit/f7dffc28b3f82e25a0e283d2b11ffb9c6a129340__;!!JmoZiZGBv3RvKRSx!-wSCRml8NKZ6L_rFklXVIa3eZ-9Oj9ghkmY_pDw3qu_F5kgPjlairS6IxzEhDrh1PHN6EmJeDNagyNtcXt744ldc21A$
>> DIFF:
>> https://urldefense.com/v3/__https://github.com/llvm/llvm-project/commit/f7dffc28b3f82e25a0e283d2b11ffb9c6a129340.diff__;!!JmoZiZGBv3RvKRSx!-wSCRml8NKZ6L_rFklXVIa3eZ-9Oj9ghkmY_pDw3qu_F5kgPjlairS6IxzEhDrh1PHN6EmJeDNagyNtcXt74E--JnXY$
>>
>> LOG: Don't include None.h (NFC)
>>
>> I've converted all known uses of None to std::nullopt, so we no longer
>> need to include None.h.
>>
>> This is part of an effort to migrate from llvm::Optional to
>> std::optional:
>>
>>
>> https://urldefense.com/v3/__https://discourse.llvm.org/t/deprecating-llvm-optional-x-hasvalue-getvalue-getvalueor/63716__;!!JmoZiZGBv3RvKRSx!-wSCRml8NKZ6L_rFklXVIa3eZ-9Oj9ghkmY_pDw3qu_F5kgPjlairS6IxzEhDrh1PHN6EmJeDNagyNtcXt74QT09naM$
>>
>> Added:
>>
>>
>> Modified:
>> clang-tools-extra/clang-tidy/NoLintDirectiveHandler.cpp
>>
>> clang-tools-extra/clang-tidy/objc/NSInvocationArgumentLifetimeCheck.cpp
>> clang-tools-extra/clangd/ConfigCompile.cpp
>> clang-tools-extra/clangd/SourceCode.cpp
>> clang-tools-extra/clangd/TUScheduler.cpp
>> clang-tools-extra/clangd/XRefs.cpp
>> clang-tools-extra/clangd/support/ThreadsafeFS.h
>> clang-tools-extra/clangd/unittests/ConfigCompileTests.cpp
>> clang-tools-extra/clangd/unittests/ConfigYAMLTests.cpp
>> clang-tools-extra/clangd/unittests/XRefsTests.cpp
>> clang/include/clang/AST/DeclObjC.h
>> clang/include/clang/AST/ExprCXX.h
>> clang/include/clang/AST/ExprObjC.h
>> clang/include/clang/AST/Type.h
>> clang/include/clang/Frontend/ASTUnit.h
>> clang/include/clang/Lex/Preprocessor.h
>> clang/include/clang/Sema/Overload.h
>> clang/lib/AST/ASTContext.cpp
>> clang/lib/AST/ASTImporter.cpp
>> clang/lib/AST/ASTStructuralEquivalence.cpp
>> clang/lib/AST/Decl.cpp
>> clang/lib/AST/DeclCXX.cpp
>> clang/lib/AST/DeclObjC.cpp
>> clang/lib/AST/DeclTemplate.cpp
>> clang/lib/AST/TemplateBase.cpp
>> clang/lib/AST/Type.cpp
>> clang/lib/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.cpp
>> clang/lib/Basic/SourceManager.cpp
>> clang/lib/Frontend/ASTUnit.cpp
>> clang/lib/Frontend/CompilerInvocation.cpp
>> clang/lib/Lex/Lexer.cpp
>> clang/lib/Lex/ModuleMap.cpp
>> clang/lib/Sema/SemaChecking.cpp
>> clang/lib/Serialization/ASTReader.cpp
>> clang/lib/StaticAnalyzer/Core/BugReporter.cpp
>>
>> clang/unittests/Analysis/FlowSensitive/MultiVarConstantPropagationTest.cpp
>>
>> clang/unittests/Analysis/FlowSensitive/SingleVarConstantPropagationTest.cpp
>> clang/utils/TableGen/NeonEmitter.cpp
>> libc/benchmarks/automemcpy/lib/RandomFunctionGenerator.cpp
>> lldb/source/Core/Debugger.cpp
>> lldb/source/Core/ThreadedCommunication.cpp
>>
>> lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp
>> lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp
>> lldb/source/Plugins/Trace/intel-pt/TraceIntelPTBundleSaver.cpp
>> llvm/include/llvm/ADT/ArrayRef.h
>> llvm/include/llvm/ADT/BreadthFirstIterator.h
>> llvm/include/llvm/ADT/DepthFirstIterator.h
>> llvm/include/llvm/ADT/Optional.h
>> llvm/include/llvm/ADT/SmallSet.h
>> llvm/include/llvm/ADT/TinyPtrVector.h
>> llvm/include/llvm/BinaryFormat/AMDGPUMetadataVerifier.h
>> llvm/include/llvm/CodeGen/LiveRangeEdit.h
>> llvm/include/llvm/CodeGen/MIRParser/MIRParser.h
>> llvm/include/llvm/CodeGen/MachineTraceMetrics.h
>> llvm/include/llvm/CodeGen/TargetInstrInfo.h
>> llvm/include/llvm/DebugInfo/CodeView/CodeViewRecordIO.h
>> llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
>> llvm/include/llvm/IR/Constants.h
>> llvm/include/llvm/IR/DebugInfoMetadata.h
>> llvm/include/llvm/IR/GCStrategy.h
>> llvm/include/llvm/IR/IRBuilder.h
>> llvm/include/llvm/IR/InstrTypes.h
>> llvm/include/llvm/IR/Instruction.h
>> llvm/include/llvm/IR/Instructions.h
>> llvm/include/llvm/IR/Intrinsics.h
>> llvm/include/llvm/IR/Metadata.h
>> llvm/include/llvm/IR/Operator.h
>> llvm/include/llvm/IR/ValueMap.h
>> llvm/include/llvm/MC/MCParser/MCAsmParser.h
>> llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h
>> llvm/include/llvm/Support/CommandLine.h
>> llvm/include/llvm/Support/VirtualFileSystem.h
>> llvm/lib/Analysis/BlockFrequencyInfo.cpp
>> llvm/lib/Analysis/ScalarEvolution.cpp
>> llvm/lib/AsmParser/LLParser.cpp
>> llvm/lib/Bitcode/Reader/MetadataLoader.cpp
>> llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
>> llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp
>> llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
>> llvm/lib/CodeGen/AsmPrinter/DwarfExpression.h
>> llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
>> llvm/lib/CodeGen/ImplicitNullChecks.cpp
>> llvm/lib/CodeGen/MIRParser/MIParser.cpp
>> llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp
>> llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
>> llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
>> llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
>> llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp
>> llvm/lib/CodeGen/SplitKit.cpp
>> llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
>> llvm/lib/IR/AsmWriter.cpp
>> llvm/lib/IR/ConstantsContext.h
>> llvm/lib/IR/Function.cpp
>> llvm/lib/IR/IRBuilder.cpp
>> llvm/lib/IR/Instructions.cpp
>> llvm/lib/MC/MCParser/AsmParser.cpp
>> llvm/lib/MC/MCParser/MasmParser.cpp
>> llvm/lib/Object/MachOObjectFile.cpp
>> llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
>> llvm/lib/Support/VirtualFileSystem.cpp
>> llvm/lib/Target/AArch64/AArch64StackTagging.cpp
>> llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
>> llvm/lib/Target/Hexagon/HexagonFrameLowering.cpp
>> llvm/lib/Target/Hexagon/HexagonVectorCombine.cpp
>> llvm/lib/Target/PowerPC/PPCISelLowering.cpp
>> llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
>> llvm/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
>> llvm/lib/Transforms/Scalar/GVNSink.cpp
>> llvm/lib/Transforms/Scalar/InductiveRangeCheckElimination.cpp
>> llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp
>> llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
>> llvm/lib/Transforms/Utils/InlineFunction.cpp
>> llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
>> llvm/tools/dsymutil/DwarfLinkerForBinary.cpp
>>
>> Removed:
>>
>>
>>
>>
>> ################################################################################
>> diff --git a/clang-tools-extra/clang-tidy/NoLintDirectiveHandler.cpp
>> b/clang-tools-extra/clang-tidy/NoLintDirectiveHandler.cpp
>> index d9c5302bd2daf..08d837c105c81 100644
>> --- a/clang-tools-extra/clang-tidy/NoLintDirectiveHandler.cpp
>> +++ b/clang-tools-extra/clang-tidy/NoLintDirectiveHandler.cpp
>> @@ -19,7 +19,6 @@
>> #include "clang/Basic/SourceManager.h"
>> #include "clang/Tooling/Core/Diagnostic.h"
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git
>> a/clang-tools-extra/clang-tidy/objc/NSInvocationArgumentLifetimeCheck.cpp
>> b/clang-tools-extra/clang-tidy/objc/NSInvocationArgumentLifetimeCheck.cpp
>> index bf3463e6dedf8..1650563a96930 100644
>> ---
>> a/clang-tools-extra/clang-tidy/objc/NSInvocationArgumentLifetimeCheck.cpp
>> +++
>> b/clang-tools-extra/clang-tidy/objc/NSInvocationArgumentLifetimeCheck.cpp
>> @@ -23,7 +23,6 @@
>> #include "clang/Basic/SourceLocation.h"
>> #include "clang/Basic/SourceManager.h"
>> #include "clang/Lex/Lexer.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/StringRef.h"
>>
>>
>> diff --git a/clang-tools-extra/clangd/ConfigCompile.cpp
>> b/clang-tools-extra/clangd/ConfigCompile.cpp
>> index bdcafd1449421..d5a1ec74b0a00 100644
>> --- a/clang-tools-extra/clangd/ConfigCompile.cpp
>> +++ b/clang-tools-extra/clangd/ConfigCompile.cpp
>> @@ -33,7 +33,6 @@
>> #include "support/Logger.h"
>> #include "support/Path.h"
>> #include "support/Trace.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallString.h"
>>
>> diff --git a/clang-tools-extra/clangd/SourceCode.cpp
>> b/clang-tools-extra/clangd/SourceCode.cpp
>> index 6a783c61e245d..0ba98f3d838fa 100644
>> --- a/clang-tools-extra/clangd/SourceCode.cpp
>> +++ b/clang-tools-extra/clangd/SourceCode.cpp
>> @@ -25,7 +25,6 @@
>> #include "clang/Tooling/Syntax/Tokens.h"
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/BitVector.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/StringExtras.h"
>> #include "llvm/ADT/StringMap.h"
>>
>> diff --git a/clang-tools-extra/clangd/TUScheduler.cpp
>> b/clang-tools-extra/clangd/TUScheduler.cpp
>> index 87e5c37259cb9..44a0d4ac941f4 100644
>> --- a/clang-tools-extra/clangd/TUScheduler.cpp
>> +++ b/clang-tools-extra/clangd/TUScheduler.cpp
>> @@ -65,7 +65,6 @@
>> #include "clang/Frontend/CompilerInvocation.h"
>> #include "clang/Tooling/CompilationDatabase.h"
>> #include "llvm/ADT/FunctionExtras.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/ScopeExit.h"
>>
>> diff --git a/clang-tools-extra/clangd/XRefs.cpp
>> b/clang-tools-extra/clangd/XRefs.cpp
>> index 644d7fe7cfaf0..e06170500efe6 100644
>> --- a/clang-tools-extra/clangd/XRefs.cpp
>> +++ b/clang-tools-extra/clangd/XRefs.cpp
>> @@ -50,7 +50,6 @@
>> #include "clang/Tooling/Syntax/Tokens.h"
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseMap.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/ScopeExit.h"
>>
>> diff --git a/clang-tools-extra/clangd/support/ThreadsafeFS.h
>> b/clang-tools-extra/clangd/support/ThreadsafeFS.h
>> index 7268ac742ce36..26ca1365c524c 100644
>> --- a/clang-tools-extra/clangd/support/ThreadsafeFS.h
>> +++ b/clang-tools-extra/clangd/support/ThreadsafeFS.h
>> @@ -11,7 +11,6 @@
>>
>> #include "Path.h"
>> #include "llvm/ADT/IntrusiveRefCntPtr.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/Support/VirtualFileSystem.h"
>> #include <memory>
>>
>>
>> diff --git a/clang-tools-extra/clangd/unittests/ConfigCompileTests.cpp
>> b/clang-tools-extra/clangd/unittests/ConfigCompileTests.cpp
>> index e19777663f69e..1c87cea329169 100644
>> --- a/clang-tools-extra/clangd/unittests/ConfigCompileTests.cpp
>> +++ b/clang-tools-extra/clangd/unittests/ConfigCompileTests.cpp
>> @@ -13,7 +13,6 @@
>> #include "Feature.h"
>> #include "TestFS.h"
>> #include "clang/Basic/DiagnosticSema.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/StringRef.h"
>> #include "llvm/Support/Path.h"
>>
>> diff --git a/clang-tools-extra/clangd/unittests/ConfigYAMLTests.cpp
>> b/clang-tools-extra/clangd/unittests/ConfigYAMLTests.cpp
>> index 50b56fa9f15a9..bbaac04f90dcd 100644
>> --- a/clang-tools-extra/clangd/unittests/ConfigYAMLTests.cpp
>> +++ b/clang-tools-extra/clangd/unittests/ConfigYAMLTests.cpp
>> @@ -10,7 +10,6 @@
>> #include "ConfigFragment.h"
>> #include "ConfigTesting.h"
>> #include "Protocol.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/StringRef.h"
>> #include "llvm/Support/SMLoc.h"
>> #include "llvm/Support/SourceMgr.h"
>>
>> diff --git a/clang-tools-extra/clangd/unittests/XRefsTests.cpp
>> b/clang-tools-extra/clangd/unittests/XRefsTests.cpp
>> index fe351aeae85f0..f91c469ddc9b6 100644
>> --- a/clang-tools-extra/clangd/unittests/XRefsTests.cpp
>> +++ b/clang-tools-extra/clangd/unittests/XRefsTests.cpp
>> @@ -17,7 +17,6 @@
>> #include "index/MemIndex.h"
>> #include "clang/AST/Decl.h"
>> #include "clang/Basic/SourceLocation.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/StringRef.h"
>> #include "llvm/Support/Casting.h"
>> #include "llvm/Support/Error.h"
>>
>> diff --git a/clang/include/clang/AST/DeclObjC.h
>> b/clang/include/clang/AST/DeclObjC.h
>> index 657f7ffb10ef0..3ba59a296cec7 100644
>> --- a/clang/include/clang/AST/DeclObjC.h
>> +++ b/clang/include/clang/AST/DeclObjC.h
>> @@ -27,7 +27,6 @@
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseSet.h"
>> #include "llvm/ADT/MapVector.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/PointerIntPair.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/StringRef.h"
>>
>> diff --git a/clang/include/clang/AST/ExprCXX.h
>> b/clang/include/clang/AST/ExprCXX.h
>> index 81267ff568c5b..c2f6751d62ede 100644
>> --- a/clang/include/clang/AST/ExprCXX.h
>> +++ b/clang/include/clang/AST/ExprCXX.h
>> @@ -40,7 +40,6 @@
>> #include "clang/Basic/Specifiers.h"
>> #include "clang/Basic/TypeTraits.h"
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/PointerUnion.h"
>> #include "llvm/ADT/StringRef.h"
>>
>> diff --git a/clang/include/clang/AST/ExprObjC.h
>> b/clang/include/clang/AST/ExprObjC.h
>> index 4c0a5b4a2a23b..24b2cad51e776 100644
>> --- a/clang/include/clang/AST/ExprObjC.h
>> +++ b/clang/include/clang/AST/ExprObjC.h
>> @@ -27,7 +27,6 @@
>> #include "clang/Basic/SourceLocation.h"
>> #include "clang/Basic/Specifiers.h"
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/PointerIntPair.h"
>> #include "llvm/ADT/PointerUnion.h"
>>
>> diff --git a/clang/include/clang/AST/Type.h
>> b/clang/include/clang/AST/Type.h
>> index 07afa0d4c1d11..87cb433177dfa 100644
>> --- a/clang/include/clang/AST/Type.h
>> +++ b/clang/include/clang/AST/Type.h
>> @@ -34,7 +34,6 @@
>> #include "llvm/ADT/APSInt.h"
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/FoldingSet.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/PointerIntPair.h"
>> #include "llvm/ADT/PointerUnion.h"
>>
>> diff --git a/clang/include/clang/Frontend/ASTUnit.h
>> b/clang/include/clang/Frontend/ASTUnit.h
>> index 9b1ce985885b1..c87e143b9cf45 100644
>> --- a/clang/include/clang/Frontend/ASTUnit.h
>> +++ b/clang/include/clang/Frontend/ASTUnit.h
>> @@ -31,7 +31,6 @@
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseMap.h"
>> #include "llvm/ADT/IntrusiveRefCntPtr.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git a/clang/include/clang/Lex/Preprocessor.h
>> b/clang/include/clang/Lex/Preprocessor.h
>> index 8f571848d62a3..05e05e883be69 100644
>> --- a/clang/include/clang/Lex/Preprocessor.h
>> +++ b/clang/include/clang/Lex/Preprocessor.h
>> @@ -35,7 +35,6 @@
>> #include "llvm/ADT/DenseMap.h"
>> #include "llvm/ADT/FoldingSet.h"
>> #include "llvm/ADT/FunctionExtras.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/PointerUnion.h"
>> #include "llvm/ADT/STLExtras.h"
>>
>> diff --git a/clang/include/clang/Sema/Overload.h
>> b/clang/include/clang/Sema/Overload.h
>> index f7773bd9c56d6..1827ea5d1e546 100644
>> --- a/clang/include/clang/Sema/Overload.h
>> +++ b/clang/include/clang/Sema/Overload.h
>> @@ -26,7 +26,6 @@
>> #include "clang/Sema/SemaFixItUtils.h"
>> #include "clang/Sema/TemplateDeduction.h"
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
>> index dd7e0bfecdaeb..9aaf7cc6565cb 100644
>> --- a/clang/lib/AST/ASTContext.cpp
>> +++ b/clang/lib/AST/ASTContext.cpp
>> @@ -71,7 +71,6 @@
>> #include "llvm/ADT/DenseMap.h"
>> #include "llvm/ADT/DenseSet.h"
>> #include "llvm/ADT/FoldingSet.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/PointerUnion.h"
>> #include "llvm/ADT/STLExtras.h"
>>
>> diff --git a/clang/lib/AST/ASTImporter.cpp
>> b/clang/lib/AST/ASTImporter.cpp
>> index 14d2d4a58eb46..e5704b39b60ee 100644
>> --- a/clang/lib/AST/ASTImporter.cpp
>> +++ b/clang/lib/AST/ASTImporter.cpp
>> @@ -56,7 +56,6 @@
>> #include "llvm/ADT/APSInt.h"
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseMap.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/ScopeExit.h"
>>
>> diff --git a/clang/lib/AST/ASTStructuralEquivalence.cpp
>> b/clang/lib/AST/ASTStructuralEquivalence.cpp
>> index e383170079b1e..e234e083813e9 100644
>> --- a/clang/lib/AST/ASTStructuralEquivalence.cpp
>> +++ b/clang/lib/AST/ASTStructuralEquivalence.cpp
>> @@ -84,7 +84,6 @@
>> #include "clang/Basic/SourceLocation.h"
>> #include "llvm/ADT/APInt.h"
>> #include "llvm/ADT/APSInt.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/StringExtras.h"
>> #include "llvm/Support/Casting.h"
>>
>> diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp
>> index bc4cc372d96b6..b1fdc897bf27e 100644
>> --- a/clang/lib/AST/Decl.cpp
>> +++ b/clang/lib/AST/Decl.cpp
>> @@ -54,7 +54,6 @@
>> #include "clang/Basic/Visibility.h"
>> #include "llvm/ADT/APSInt.h"
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git a/clang/lib/AST/DeclCXX.cpp b/clang/lib/AST/DeclCXX.cpp
>> index 812cbabc00b8c..8f06b9b5c3312 100644
>> --- a/clang/lib/AST/DeclCXX.cpp
>> +++ b/clang/lib/AST/DeclCXX.cpp
>> @@ -37,7 +37,6 @@
>> #include "clang/Basic/SourceLocation.h"
>> #include "clang/Basic/Specifiers.h"
>> #include "clang/Basic/TargetInfo.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include "llvm/ADT/iterator_range.h"
>>
>> diff --git a/clang/lib/AST/DeclObjC.cpp b/clang/lib/AST/DeclObjC.cpp
>> index 2dafca1369771..6b21f7890b782 100644
>> --- a/clang/lib/AST/DeclObjC.cpp
>> +++ b/clang/lib/AST/DeclObjC.cpp
>> @@ -24,7 +24,6 @@
>> #include "clang/Basic/LLVM.h"
>> #include "clang/Basic/LangOptions.h"
>> #include "clang/Basic/SourceLocation.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/SmallString.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include "llvm/Support/Casting.h"
>>
>> diff --git a/clang/lib/AST/DeclTemplate.cpp
>> b/clang/lib/AST/DeclTemplate.cpp
>> index ae258ee4b75a0..0b21100bb82b1 100644
>> --- a/clang/lib/AST/DeclTemplate.cpp
>> +++ b/clang/lib/AST/DeclTemplate.cpp
>> @@ -26,7 +26,6 @@
>> #include "clang/Basic/SourceLocation.h"
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/FoldingSet.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/PointerUnion.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git a/clang/lib/AST/TemplateBase.cpp
>> b/clang/lib/AST/TemplateBase.cpp
>> index db44536f63241..bd3a3e9d9cf14 100644
>> --- a/clang/lib/AST/TemplateBase.cpp
>> +++ b/clang/lib/AST/TemplateBase.cpp
>> @@ -29,7 +29,6 @@
>> #include "clang/Basic/SourceLocation.h"
>> #include "llvm/ADT/APSInt.h"
>> #include "llvm/ADT/FoldingSet.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/SmallString.h"
>> #include "llvm/ADT/StringExtras.h"
>> #include "llvm/ADT/StringRef.h"
>>
>> diff --git a/clang/lib/AST/Type.cpp b/clang/lib/AST/Type.cpp
>> index 49e6eb336b5cf..62383c671f92c 100644
>> --- a/clang/lib/AST/Type.cpp
>> +++ b/clang/lib/AST/Type.cpp
>> @@ -42,7 +42,6 @@
>> #include "llvm/ADT/APSInt.h"
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/FoldingSet.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include "llvm/Support/Casting.h"
>> #include "llvm/Support/ErrorHandling.h"
>>
>> diff --git
>> a/clang/lib/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.cpp
>> b/clang/lib/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.cpp
>> index 9c6a3ba679347..e221a8bba22ad 100644
>> --- a/clang/lib/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.cpp
>> +++ b/clang/lib/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.cpp
>> @@ -30,7 +30,6 @@
>> #include "clang/Analysis/FlowSensitive/Value.h"
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseSet.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/Support/Error.h"
>>
>> diff --git a/clang/lib/Basic/SourceManager.cpp
>> b/clang/lib/Basic/SourceManager.cpp
>> index 96f0c4217166b..8eca151e82e14 100644
>> --- a/clang/lib/Basic/SourceManager.cpp
>> +++ b/clang/lib/Basic/SourceManager.cpp
>> @@ -18,7 +18,6 @@
>> #include "clang/Basic/SourceManagerInternals.h"
>> #include "llvm/ADT/DenseMap.h"
>> #include "llvm/ADT/MapVector.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git a/clang/lib/Frontend/ASTUnit.cpp
>> b/clang/lib/Frontend/ASTUnit.cpp
>> index f5d4b56bca027..acea2bf51430a 100644
>> --- a/clang/lib/Frontend/ASTUnit.cpp
>> +++ b/clang/lib/Frontend/ASTUnit.cpp
>> @@ -66,7 +66,6 @@
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseMap.h"
>> #include "llvm/ADT/IntrusiveRefCntPtr.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/ScopeExit.h"
>>
>> diff --git a/clang/lib/Frontend/CompilerInvocation.cpp
>> b/clang/lib/Frontend/CompilerInvocation.cpp
>> index ef3fc6c2afb7f..29a626ae6353e 100644
>> --- a/clang/lib/Frontend/CompilerInvocation.cpp
>> +++ b/clang/lib/Frontend/CompilerInvocation.cpp
>> @@ -52,7 +52,6 @@
>> #include "llvm/ADT/DenseSet.h"
>> #include "llvm/ADT/FloatingPointMode.h"
>> #include "llvm/ADT/Hashing.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallString.h"
>>
>> diff --git a/clang/lib/Lex/Lexer.cpp b/clang/lib/Lex/Lexer.cpp
>> index 5679e10605a63..fc0b42f4688c1 100644
>> --- a/clang/lib/Lex/Lexer.cpp
>> +++ b/clang/lib/Lex/Lexer.cpp
>> @@ -26,7 +26,6 @@
>> #include "clang/Lex/Preprocessor.h"
>> #include "clang/Lex/PreprocessorOptions.h"
>> #include "clang/Lex/Token.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/StringExtras.h"
>>
>> diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp
>> index b66d95d8c0c20..10329229f71e7 100644
>> --- a/clang/lib/Lex/ModuleMap.cpp
>> +++ b/clang/lib/Lex/ModuleMap.cpp
>> @@ -28,7 +28,6 @@
>> #include "clang/Lex/LiteralSupport.h"
>> #include "clang/Lex/Token.h"
>> #include "llvm/ADT/DenseMap.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>> #include "llvm/ADT/SmallString.h"
>>
>> diff --git a/clang/lib/Sema/SemaChecking.cpp
>> b/clang/lib/Sema/SemaChecking.cpp
>> index 48a11b853ec20..97345a8a75f19 100644
>> --- a/clang/lib/Sema/SemaChecking.cpp
>> +++ b/clang/lib/Sema/SemaChecking.cpp
>> @@ -67,7 +67,6 @@
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseMap.h"
>> #include "llvm/ADT/FoldingSet.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallBitVector.h"
>>
>> diff --git a/clang/lib/Serialization/ASTReader.cpp
>> b/clang/lib/Serialization/ASTReader.cpp
>> index f577eba6e04be..1a2d63bdc86bb 100644
>> --- a/clang/lib/Serialization/ASTReader.cpp
>> +++ b/clang/lib/Serialization/ASTReader.cpp
>> @@ -97,7 +97,6 @@
>> #include "llvm/ADT/FoldingSet.h"
>> #include "llvm/ADT/Hashing.h"
>> #include "llvm/ADT/IntrusiveRefCntPtr.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/ScopeExit.h"
>>
>> diff --git a/clang/lib/StaticAnalyzer/Core/BugReporter.cpp
>> b/clang/lib/StaticAnalyzer/Core/BugReporter.cpp
>> index b52f3854683f6..70ec6face951b 100644
>> --- a/clang/lib/StaticAnalyzer/Core/BugReporter.cpp
>> +++ b/clang/lib/StaticAnalyzer/Core/BugReporter.cpp
>> @@ -46,7 +46,6 @@
>> #include "llvm/ADT/DenseMap.h"
>> #include "llvm/ADT/DenseSet.h"
>> #include "llvm/ADT/FoldingSet.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>>
>> diff --git
>> a/clang/unittests/Analysis/FlowSensitive/MultiVarConstantPropagationTest.cpp
>> b/clang/unittests/Analysis/FlowSensitive/MultiVarConstantPropagationTest.cpp
>> index 4562a6294b2df..d454858e93482 100644
>> ---
>> a/clang/unittests/Analysis/FlowSensitive/MultiVarConstantPropagationTest.cpp
>> +++
>> b/clang/unittests/Analysis/FlowSensitive/MultiVarConstantPropagationTest.cpp
>> @@ -24,7 +24,6 @@
>> #include "clang/Analysis/FlowSensitive/DataflowEnvironment.h"
>> #include "clang/Analysis/FlowSensitive/DataflowLattice.h"
>> #include "clang/Analysis/FlowSensitive/MapLattice.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/StringRef.h"
>> #include "llvm/ADT/Twine.h"
>>
>> diff --git
>> a/clang/unittests/Analysis/FlowSensitive/SingleVarConstantPropagationTest.cpp
>> b/clang/unittests/Analysis/FlowSensitive/SingleVarConstantPropagationTest.cpp
>> index 9c52ed1b52e2f..98863e4b43ded 100644
>> ---
>> a/clang/unittests/Analysis/FlowSensitive/SingleVarConstantPropagationTest.cpp
>> +++
>> b/clang/unittests/Analysis/FlowSensitive/SingleVarConstantPropagationTest.cpp
>> @@ -23,7 +23,6 @@
>> #include "clang/Analysis/FlowSensitive/DataflowAnalysis.h"
>> #include "clang/Analysis/FlowSensitive/DataflowEnvironment.h"
>> #include "clang/Analysis/FlowSensitive/DataflowLattice.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/StringRef.h"
>> #include "llvm/ADT/Twine.h"
>>
>> diff --git a/clang/utils/TableGen/NeonEmitter.cpp
>> b/clang/utils/TableGen/NeonEmitter.cpp
>> index 56e11773bf707..98e195d0a63a2 100644
>> --- a/clang/utils/TableGen/NeonEmitter.cpp
>> +++ b/clang/utils/TableGen/NeonEmitter.cpp
>> @@ -26,7 +26,6 @@
>> #include "TableGenBackends.h"
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseMap.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git a/libc/benchmarks/automemcpy/lib/RandomFunctionGenerator.cpp
>> b/libc/benchmarks/automemcpy/lib/RandomFunctionGenerator.cpp
>> index ec84173832005..e4ba20542258d 100644
>> --- a/libc/benchmarks/automemcpy/lib/RandomFunctionGenerator.cpp
>> +++ b/libc/benchmarks/automemcpy/lib/RandomFunctionGenerator.cpp
>> @@ -8,7 +8,6 @@
>>
>> #include "automemcpy/RandomFunctionGenerator.h"
>>
>> -#include <llvm/ADT/None.h>
>> #include <llvm/ADT/StringRef.h>
>> #include <llvm/Support/raw_ostream.h>
>>
>>
>> diff --git a/lldb/source/Core/Debugger.cpp
>> b/lldb/source/Core/Debugger.cpp
>> index b3d3f7e6a9ffe..e087de1fcc619 100644
>> --- a/lldb/source/Core/Debugger.cpp
>> +++ b/lldb/source/Core/Debugger.cpp
>> @@ -59,7 +59,6 @@
>> #include "lldb/Host/windows/windows.h"
>> #endif
>>
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/StringRef.h"
>> #include "llvm/ADT/iterator.h"
>>
>> diff --git a/lldb/source/Core/ThreadedCommunication.cpp
>> b/lldb/source/Core/ThreadedCommunication.cpp
>> index 0ce97586f09f9..d547c858f0f57 100644
>> --- a/lldb/source/Core/ThreadedCommunication.cpp
>> +++ b/lldb/source/Core/ThreadedCommunication.cpp
>> @@ -17,7 +17,6 @@
>> #include "lldb/Utility/Log.h"
>> #include "lldb/Utility/Status.h"
>>
>> -#include "llvm/ADT/None.h"
>> #include "llvm/Support/Compiler.h"
>>
>> #include <algorithm>
>>
>> diff --git
>> a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp
>> b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp
>> index 39adb42b645c1..2430ec3ff5d45 100644
>> ---
>> a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp
>> +++
>> b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptExpressionOpts.cpp
>> @@ -8,7 +8,6 @@
>>
>> #include <string>
>>
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/StringRef.h"
>> #include "llvm/IR/Instruction.h"
>> #include "llvm/IR/Instructions.h"
>>
>> diff --git a/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp
>> b/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp
>> index 99ddb5d312c8e..d6e4511147a62 100644
>> --- a/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp
>> +++ b/lldb/source/Plugins/Trace/intel-pt/TraceIntelPT.cpp
>> @@ -19,7 +19,6 @@
>> #include "lldb/Interpreter/OptionValueProperties.h"
>> #include "lldb/Target/Process.h"
>> #include "lldb/Target/Target.h"
>> -#include "llvm/ADT/None.h"
>>
>> using namespace lldb;
>> using namespace lldb_private;
>>
>> diff --git
>> a/lldb/source/Plugins/Trace/intel-pt/TraceIntelPTBundleSaver.cpp
>> b/lldb/source/Plugins/Trace/intel-pt/TraceIntelPTBundleSaver.cpp
>> index 17c8f070eecc4..653cdde203d45 100644
>> --- a/lldb/source/Plugins/Trace/intel-pt/TraceIntelPTBundleSaver.cpp
>> +++ b/lldb/source/Plugins/Trace/intel-pt/TraceIntelPTBundleSaver.cpp
>> @@ -18,7 +18,6 @@
>> #include "lldb/Target/Target.h"
>> #include "lldb/Target/ThreadList.h"
>> #include "lldb/lldb-types.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/Support/Error.h"
>> #include "llvm/Support/JSON.h"
>> #include <fstream>
>>
>> diff --git a/llvm/include/llvm/ADT/ArrayRef.h
>> b/llvm/include/llvm/ADT/ArrayRef.h
>> index c68e8dfbec9e3..09c6188469ea5 100644
>> --- a/llvm/include/llvm/ADT/ArrayRef.h
>> +++ b/llvm/include/llvm/ADT/ArrayRef.h
>> @@ -10,7 +10,6 @@
>> #define LLVM_ADT_ARRAYREF_H
>>
>> #include "llvm/ADT/Hashing.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/Support/Compiler.h"
>>
>> diff --git a/llvm/include/llvm/ADT/BreadthFirstIterator.h
>> b/llvm/include/llvm/ADT/BreadthFirstIterator.h
>> index 56a1bb1cb603d..cfeb7a761d7f1 100644
>> --- a/llvm/include/llvm/ADT/BreadthFirstIterator.h
>> +++ b/llvm/include/llvm/ADT/BreadthFirstIterator.h
>> @@ -19,7 +19,6 @@
>> #define LLVM_ADT_BREADTHFIRSTITERATOR_H
>>
>> #include "llvm/ADT/GraphTraits.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>> #include "llvm/ADT/iterator_range.h"
>>
>> diff --git a/llvm/include/llvm/ADT/DepthFirstIterator.h
>> b/llvm/include/llvm/ADT/DepthFirstIterator.h
>> index 513cc56f68923..04223d5fe2263 100644
>> --- a/llvm/include/llvm/ADT/DepthFirstIterator.h
>> +++ b/llvm/include/llvm/ADT/DepthFirstIterator.h
>> @@ -35,7 +35,6 @@
>> #define LLVM_ADT_DEPTHFIRSTITERATOR_H
>>
>> #include "llvm/ADT/GraphTraits.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>> #include "llvm/ADT/iterator_range.h"
>>
>> diff --git a/llvm/include/llvm/ADT/Optional.h
>> b/llvm/include/llvm/ADT/Optional.h
>> index a9f22c783df8f..5574382f22b68 100644
>> --- a/llvm/include/llvm/ADT/Optional.h
>> +++ b/llvm/include/llvm/ADT/Optional.h
>> @@ -17,7 +17,6 @@
>> #define LLVM_ADT_OPTIONAL_H
>>
>> #include "llvm/ADT/Hashing.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/Support/Compiler.h"
>> #include "llvm/Support/type_traits.h"
>> #include <cassert>
>>
>> diff --git a/llvm/include/llvm/ADT/SmallSet.h
>> b/llvm/include/llvm/ADT/SmallSet.h
>> index d64620397d3da..5ac868d58314c 100644
>> --- a/llvm/include/llvm/ADT/SmallSet.h
>> +++ b/llvm/include/llvm/ADT/SmallSet.h
>> @@ -14,7 +14,6 @@
>> #ifndef LLVM_ADT_SMALLSET_H
>> #define LLVM_ADT_SMALLSET_H
>>
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include "llvm/ADT/STLExtras.h"
>>
>> diff --git a/llvm/include/llvm/ADT/TinyPtrVector.h
>> b/llvm/include/llvm/ADT/TinyPtrVector.h
>> index b96b7ea1f006c..aa87fd66ac20e 100644
>> --- a/llvm/include/llvm/ADT/TinyPtrVector.h
>> +++ b/llvm/include/llvm/ADT/TinyPtrVector.h
>> @@ -10,7 +10,6 @@
>> #define LLVM_ADT_TINYPTRVECTOR_H
>>
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/PointerUnion.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include <cassert>
>>
>> diff --git a/llvm/include/llvm/BinaryFormat/AMDGPUMetadataVerifier.h
>> b/llvm/include/llvm/BinaryFormat/AMDGPUMetadataVerifier.h
>> index 04afcf10c5957..345c3370f77c3 100644
>> --- a/llvm/include/llvm/BinaryFormat/AMDGPUMetadataVerifier.h
>> +++ b/llvm/include/llvm/BinaryFormat/AMDGPUMetadataVerifier.h
>> @@ -16,7 +16,6 @@
>> #ifndef LLVM_BINARYFORMAT_AMDGPUMETADATAVERIFIER_H
>> #define LLVM_BINARYFORMAT_AMDGPUMETADATAVERIFIER_H
>>
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLFunctionalExtras.h"
>> #include "llvm/ADT/StringRef.h"
>>
>> diff --git a/llvm/include/llvm/CodeGen/LiveRangeEdit.h
>> b/llvm/include/llvm/CodeGen/LiveRangeEdit.h
>> index a4fcfa86377f9..aaaf8ea5b0030 100644
>> --- a/llvm/include/llvm/CodeGen/LiveRangeEdit.h
>> +++ b/llvm/include/llvm/CodeGen/LiveRangeEdit.h
>> @@ -18,7 +18,6 @@
>> #define LLVM_CODEGEN_LIVERANGEEDIT_H
>>
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/SetVector.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git a/llvm/include/llvm/CodeGen/MIRParser/MIRParser.h
>> b/llvm/include/llvm/CodeGen/MIRParser/MIRParser.h
>> index eb4dfd24eeba9..1f94f7722602a 100644
>> --- a/llvm/include/llvm/CodeGen/MIRParser/MIRParser.h
>> +++ b/llvm/include/llvm/CodeGen/MIRParser/MIRParser.h
>> @@ -17,7 +17,6 @@
>> #ifndef LLVM_CODEGEN_MIRPARSER_MIRPARSER_H
>> #define LLVM_CODEGEN_MIRPARSER_MIRPARSER_H
>>
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLFunctionalExtras.h"
>> #include "llvm/ADT/StringRef.h"
>> #include <functional>
>>
>> diff --git a/llvm/include/llvm/CodeGen/MachineTraceMetrics.h
>> b/llvm/include/llvm/CodeGen/MachineTraceMetrics.h
>> index 8fdb116788dc1..89c9c94455d96 100644
>> --- a/llvm/include/llvm/CodeGen/MachineTraceMetrics.h
>> +++ b/llvm/include/llvm/CodeGen/MachineTraceMetrics.h
>> @@ -49,7 +49,6 @@
>> #include "llvm/ADT/SparseSet.h"
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseMap.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include "llvm/CodeGen/MachineBasicBlock.h"
>> #include "llvm/CodeGen/MachineFunctionPass.h"
>>
>> diff --git a/llvm/include/llvm/CodeGen/TargetInstrInfo.h
>> b/llvm/include/llvm/CodeGen/TargetInstrInfo.h
>> index ed6371b654114..c64e10f10837f 100644
>> --- a/llvm/include/llvm/CodeGen/TargetInstrInfo.h
>> +++ b/llvm/include/llvm/CodeGen/TargetInstrInfo.h
>> @@ -16,7 +16,6 @@
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseMap.h"
>> #include "llvm/ADT/DenseMapInfo.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/CodeGen/MIRFormatter.h"
>> #include "llvm/CodeGen/MachineBasicBlock.h"
>> #include "llvm/CodeGen/MachineFunction.h"
>>
>> diff --git a/llvm/include/llvm/DebugInfo/CodeView/CodeViewRecordIO.h
>> b/llvm/include/llvm/DebugInfo/CodeView/CodeViewRecordIO.h
>> index 5a2d0c6c049a9..29ba0c3eb7850 100644
>> --- a/llvm/include/llvm/DebugInfo/CodeView/CodeViewRecordIO.h
>> +++ b/llvm/include/llvm/DebugInfo/CodeView/CodeViewRecordIO.h
>> @@ -9,7 +9,6 @@
>> #ifndef LLVM_DEBUGINFO_CODEVIEW_CODEVIEWRECORDIO_H
>> #define LLVM_DEBUGINFO_CODEVIEW_CODEVIEWRECORDIO_H
>>
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include "llvm/ADT/StringRef.h"
>> #include "llvm/DebugInfo/CodeView/CodeViewError.h"
>>
>> diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
>> b/llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
>> index 5a78003b803ae..1951d085e5dc5 100644
>> --- a/llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
>> +++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
>> @@ -10,7 +10,6 @@
>> #define LLVM_DEBUGINFO_DWARF_DWARFFORMVALUE_H
>>
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/BinaryFormat/Dwarf.h"
>> #include "llvm/DebugInfo/DIContext.h"
>> #include "llvm/Support/DataExtractor.h"
>>
>> diff --git a/llvm/include/llvm/IR/Constants.h
>> b/llvm/include/llvm/IR/Constants.h
>> index f6c1986f38238..bb66255f1fc2d 100644
>> --- a/llvm/include/llvm/IR/Constants.h
>> +++ b/llvm/include/llvm/IR/Constants.h
>> @@ -23,7 +23,6 @@
>> #include "llvm/ADT/APFloat.h"
>> #include "llvm/ADT/APInt.h"
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/StringRef.h"
>> #include "llvm/IR/Constant.h"
>>
>> diff --git a/llvm/include/llvm/IR/DebugInfoMetadata.h
>> b/llvm/include/llvm/IR/DebugInfoMetadata.h
>> index d2ecae606b469..ed2058c95fe78 100644
>> --- a/llvm/include/llvm/IR/DebugInfoMetadata.h
>> +++ b/llvm/include/llvm/IR/DebugInfoMetadata.h
>> @@ -15,7 +15,6 @@
>>
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/BitmaskEnum.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/PointerUnion.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git a/llvm/include/llvm/IR/GCStrategy.h
>> b/llvm/include/llvm/IR/GCStrategy.h
>> index 8b6cc839bdc6b..05f5d82e71e75 100644
>> --- a/llvm/include/llvm/IR/GCStrategy.h
>> +++ b/llvm/include/llvm/IR/GCStrategy.h
>> @@ -47,7 +47,6 @@
>> #ifndef LLVM_IR_GCSTRATEGY_H
>> #define LLVM_IR_GCSTRATEGY_H
>>
>> -#include "llvm/ADT/None.h"
>> #include "llvm/Support/Registry.h"
>> #include <optional>
>> #include <string>
>>
>> diff --git a/llvm/include/llvm/IR/IRBuilder.h
>> b/llvm/include/llvm/IR/IRBuilder.h
>> index 59fba7a8211d0..592d608fea7bc 100644
>> --- a/llvm/include/llvm/IR/IRBuilder.h
>> +++ b/llvm/include/llvm/IR/IRBuilder.h
>> @@ -16,7 +16,6 @@
>>
>> #include "llvm-c/Types.h"
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/StringRef.h"
>> #include "llvm/ADT/Twine.h"
>>
>> diff --git a/llvm/include/llvm/IR/InstrTypes.h
>> b/llvm/include/llvm/IR/InstrTypes.h
>> index ef7c677d19f0d..cd4d6aefa7d4c 100644
>> --- a/llvm/include/llvm/IR/InstrTypes.h
>> +++ b/llvm/include/llvm/IR/InstrTypes.h
>> @@ -16,7 +16,6 @@
>> #define LLVM_IR_INSTRTYPES_H
>>
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/Sequence.h"
>> #include "llvm/ADT/StringMap.h"
>>
>> diff --git a/llvm/include/llvm/IR/Instruction.h
>> b/llvm/include/llvm/IR/Instruction.h
>> index 63609587bc8ad..0954c90626295 100644
>> --- a/llvm/include/llvm/IR/Instruction.h
>> +++ b/llvm/include/llvm/IR/Instruction.h
>> @@ -16,7 +16,6 @@
>>
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/Bitfields.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/StringRef.h"
>> #include "llvm/ADT/ilist_node.h"
>> #include "llvm/IR/DebugLoc.h"
>>
>> diff --git a/llvm/include/llvm/IR/Instructions.h
>> b/llvm/include/llvm/IR/Instructions.h
>> index 0af65c936597a..ed4bfa850af4d 100644
>> --- a/llvm/include/llvm/IR/Instructions.h
>> +++ b/llvm/include/llvm/IR/Instructions.h
>> @@ -18,7 +18,6 @@
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/Bitfields.h"
>> #include "llvm/ADT/MapVector.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include "llvm/ADT/Twine.h"
>>
>> diff --git a/llvm/include/llvm/IR/Intrinsics.h
>> b/llvm/include/llvm/IR/Intrinsics.h
>> index 7459ea9e689d0..e9d39a606b7f1 100644
>> --- a/llvm/include/llvm/IR/Intrinsics.h
>> +++ b/llvm/include/llvm/IR/Intrinsics.h
>> @@ -16,7 +16,6 @@
>> #define LLVM_IR_INTRINSICS_H
>>
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/Support/TypeSize.h"
>> #include <optional>
>> #include <string>
>>
>> diff --git a/llvm/include/llvm/IR/Metadata.h
>> b/llvm/include/llvm/IR/Metadata.h
>> index bef69f82a5957..2ad87294f8ede 100644
>> --- a/llvm/include/llvm/IR/Metadata.h
>> +++ b/llvm/include/llvm/IR/Metadata.h
>> @@ -18,7 +18,6 @@
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseMap.h"
>> #include "llvm/ADT/DenseMapInfo.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/PointerUnion.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include "llvm/ADT/StringRef.h"
>>
>> diff --git a/llvm/include/llvm/IR/Operator.h
>> b/llvm/include/llvm/IR/Operator.h
>> index 215b1d36837e5..fedf3587e5436 100644
>> --- a/llvm/include/llvm/IR/Operator.h
>> +++ b/llvm/include/llvm/IR/Operator.h
>> @@ -15,7 +15,6 @@
>> #define LLVM_IR_OPERATOR_H
>>
>> #include "llvm/ADT/MapVector.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/IR/Constants.h"
>> #include "llvm/IR/FMF.h"
>> #include "llvm/IR/Instruction.h"
>>
>> diff --git a/llvm/include/llvm/IR/ValueMap.h
>> b/llvm/include/llvm/IR/ValueMap.h
>> index 5e26f68efdc85..d12d639aaa888 100644
>> --- a/llvm/include/llvm/IR/ValueMap.h
>> +++ b/llvm/include/llvm/IR/ValueMap.h
>> @@ -27,7 +27,6 @@
>>
>> #include "llvm/ADT/DenseMap.h"
>> #include "llvm/ADT/DenseMapInfo.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/IR/TrackingMDRef.h"
>> #include "llvm/IR/ValueHandle.h"
>> #include "llvm/Support/Casting.h"
>>
>> diff --git a/llvm/include/llvm/MC/MCParser/MCAsmParser.h
>> b/llvm/include/llvm/MC/MCParser/MCAsmParser.h
>> index 394f925d17e4b..bf9e3b594566c 100644
>> --- a/llvm/include/llvm/MC/MCParser/MCAsmParser.h
>> +++ b/llvm/include/llvm/MC/MCParser/MCAsmParser.h
>> @@ -9,7 +9,6 @@
>> #ifndef LLVM_MC_MCPARSER_MCASMPARSER_H
>> #define LLVM_MC_MCPARSER_MCASMPARSER_H
>>
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLFunctionalExtras.h"
>> #include "llvm/ADT/SmallString.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git a/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h
>> b/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h
>> index 7d82f3eb93eec..4d48308d5509e 100644
>> --- a/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h
>> +++ b/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h
>> @@ -18,7 +18,6 @@
>> #include "llvm/ADT/DenseMap.h"
>> #include "llvm/ADT/DenseSet.h"
>> #include "llvm/ADT/Hashing.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/StringRef.h"
>> #include "llvm/ADT/iterator.h"
>> #include "llvm/ADT/iterator_range.h"
>>
>> diff --git a/llvm/include/llvm/Support/CommandLine.h
>> b/llvm/include/llvm/Support/CommandLine.h
>> index 638ce1da8d28f..43c769c1fd0ad 100644
>> --- a/llvm/include/llvm/Support/CommandLine.h
>> +++ b/llvm/include/llvm/Support/CommandLine.h
>> @@ -20,7 +20,6 @@
>> #define LLVM_SUPPORT_COMMANDLINE_H
>>
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git a/llvm/include/llvm/Support/VirtualFileSystem.h
>> b/llvm/include/llvm/Support/VirtualFileSystem.h
>> index 6aec30c29b725..7ae8d70344f6a 100644
>> --- a/llvm/include/llvm/Support/VirtualFileSystem.h
>> +++ b/llvm/include/llvm/Support/VirtualFileSystem.h
>> @@ -15,7 +15,6 @@
>> #define LLVM_SUPPORT_VIRTUALFILESYSTEM_H
>>
>> #include "llvm/ADT/IntrusiveRefCntPtr.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include "llvm/ADT/StringRef.h"
>>
>> diff --git a/llvm/lib/Analysis/BlockFrequencyInfo.cpp
>> b/llvm/lib/Analysis/BlockFrequencyInfo.cpp
>> index 923b24e4d25b1..dd84336da604b 100644
>> --- a/llvm/lib/Analysis/BlockFrequencyInfo.cpp
>> +++ b/llvm/lib/Analysis/BlockFrequencyInfo.cpp
>> @@ -12,7 +12,6 @@
>>
>> #include "llvm/Analysis/BlockFrequencyInfo.h"
>> #include "llvm/ADT/APInt.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/iterator.h"
>> #include "llvm/Analysis/BlockFrequencyInfoImpl.h"
>> #include "llvm/Analysis/BranchProbabilityInfo.h"
>>
>> diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp
>> b/llvm/lib/Analysis/ScalarEvolution.cpp
>> index 19ebec8619f35..a32a059ed9999 100644
>> --- a/llvm/lib/Analysis/ScalarEvolution.cpp
>> +++ b/llvm/lib/Analysis/ScalarEvolution.cpp
>> @@ -64,7 +64,6 @@
>> #include "llvm/ADT/DepthFirstIterator.h"
>> #include "llvm/ADT/EquivalenceClasses.h"
>> #include "llvm/ADT/FoldingSet.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/ScopeExit.h"
>> #include "llvm/ADT/Sequence.h"
>>
>> diff --git a/llvm/lib/AsmParser/LLParser.cpp
>> b/llvm/lib/AsmParser/LLParser.cpp
>> index 36ebdb09c8268..a5f996b07a726 100644
>> --- a/llvm/lib/AsmParser/LLParser.cpp
>> +++ b/llvm/lib/AsmParser/LLParser.cpp
>> @@ -13,7 +13,6 @@
>> #include "llvm/AsmParser/LLParser.h"
>> #include "llvm/ADT/APSInt.h"
>> #include "llvm/ADT/DenseMap.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/ScopeExit.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>>
>> diff --git a/llvm/lib/Bitcode/Reader/MetadataLoader.cpp
>> b/llvm/lib/Bitcode/Reader/MetadataLoader.cpp
>> index 96f436a9b137d..1f322151f01be 100644
>> --- a/llvm/lib/Bitcode/Reader/MetadataLoader.cpp
>> +++ b/llvm/lib/Bitcode/Reader/MetadataLoader.cpp
>> @@ -14,7 +14,6 @@
>> #include "llvm/ADT/BitmaskEnum.h"
>> #include "llvm/ADT/DenseMap.h"
>> #include "llvm/ADT/DenseSet.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLFunctionalExtras.h"
>> #include "llvm/ADT/SmallString.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
>> b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
>> index 28b1bac8960fd..339fae04b9837 100644
>> --- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
>> +++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
>> @@ -16,7 +16,6 @@
>> #include "llvm/ADT/APInt.h"
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseMap.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SetVector.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>>
>> diff --git a/llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp
>> b/llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp
>> index 2cf31cad86c57..dc09b529cc091 100644
>> --- a/llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp
>> +++ b/llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp
>> @@ -12,7 +12,6 @@
>>
>> #include "CodeViewDebug.h"
>> #include "llvm/ADT/APSInt.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallString.h"
>>
>> diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
>> b/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
>> index 14701bfeb8c42..1727671ff5816 100644
>> --- a/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
>> +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
>> @@ -13,7 +13,6 @@
>> #include "DwarfCompileUnit.h"
>> #include "AddressPool.h"
>> #include "DwarfExpression.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallString.h"
>> #include "llvm/BinaryFormat/Dwarf.h"
>>
>> diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.h
>> b/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.h
>> index 3cb5f56df06a9..b869e28a74f50 100644
>> --- a/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.h
>> +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.h
>> @@ -15,7 +15,6 @@
>>
>> #include "ByteStreamer.h"
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include "llvm/IR/DebugInfoMetadata.h"
>>
>> diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
>> b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
>> index 22537c8a050bf..bdb3fd91db6fb 100644
>> --- a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
>> +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
>> @@ -16,7 +16,6 @@
>> #include "DwarfExpression.h"
>> #include "llvm/ADT/APFloat.h"
>> #include "llvm/ADT/APInt.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/iterator_range.h"
>> #include "llvm/CodeGen/TargetRegisterInfo.h"
>> #include "llvm/IR/Constants.h"
>>
>> diff --git a/llvm/lib/CodeGen/ImplicitNullChecks.cpp
>> b/llvm/lib/CodeGen/ImplicitNullChecks.cpp
>> index ab45269d3fc03..2bdae0e640079 100644
>> --- a/llvm/lib/CodeGen/ImplicitNullChecks.cpp
>> +++ b/llvm/lib/CodeGen/ImplicitNullChecks.cpp
>> @@ -26,7 +26,6 @@
>>
>> //===----------------------------------------------------------------------===//
>>
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git a/llvm/lib/CodeGen/MIRParser/MIParser.cpp
>> b/llvm/lib/CodeGen/MIRParser/MIParser.cpp
>> index 3935bf92496ce..8bcf5e25373dc 100644
>> --- a/llvm/lib/CodeGen/MIRParser/MIParser.cpp
>> +++ b/llvm/lib/CodeGen/MIRParser/MIParser.cpp
>> @@ -16,7 +16,6 @@
>> #include "llvm/ADT/APSInt.h"
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseMap.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include "llvm/ADT/StringMap.h"
>>
>> diff --git a/llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp
>> b/llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp
>> index 86dd3e92e2304..b1cbe525d7e6c 100644
>> --- a/llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp
>> +++ b/llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp
>> @@ -12,7 +12,6 @@
>>
>> #include "llvm/CodeGen/MachineBlockFrequencyInfo.h"
>> #include "llvm/ADT/DenseMap.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/iterator.h"
>> #include "llvm/Analysis/BlockFrequencyInfoImpl.h"
>> #include "llvm/CodeGen/MachineBasicBlock.h"
>>
>> diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
>> b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
>> index 4aaae27e87402..7c888fac32d7a 100644
>> --- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
>> +++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
>> @@ -20,7 +20,6 @@
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseMap.h"
>> #include "llvm/ADT/IntervalMap.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SetVector.h"
>>
>> diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
>> b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
>> index fbe9841623b1c..2cb93dedb7680 100644
>> --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
>> +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
>> @@ -18,7 +18,6 @@
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/BitVector.h"
>> #include "llvm/ADT/FoldingSet.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
>> b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
>> index 89f9b447d8aa3..a544879f86413 100644
>> --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
>> +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
>> @@ -15,7 +15,6 @@
>> #include "llvm/ADT/APFloat.h"
>> #include "llvm/ADT/APInt.h"
>> #include "llvm/ADT/BitVector.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>> #include "llvm/ADT/SmallSet.h"
>>
>> diff --git a/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp
>> b/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp
>> index f93bc40b744b7..39e2c39eb29cb 100644
>> --- a/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp
>> +++ b/llvm/lib/CodeGen/SelectionDAG/StatepointLowering.cpp
>> @@ -14,7 +14,6 @@
>> #include "StatepointLowering.h"
>> #include "SelectionDAGBuilder.h"
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SetVector.h"
>>
>> diff --git a/llvm/lib/CodeGen/SplitKit.cpp
>> b/llvm/lib/CodeGen/SplitKit.cpp
>> index 5c9a6ebe8b7e9..92e820c9d3d82 100644
>> --- a/llvm/lib/CodeGen/SplitKit.cpp
>> +++ b/llvm/lib/CodeGen/SplitKit.cpp
>> @@ -12,7 +12,6 @@
>>
>> //===----------------------------------------------------------------------===//
>>
>> #include "SplitKit.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/Statistic.h"
>> #include "llvm/Analysis/AliasAnalysis.h"
>>
>> diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
>> b/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
>> index 29303fe909ece..93e7a7db855e8 100644
>> --- a/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
>> +++ b/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
>> @@ -7,7 +7,6 @@
>>
>> //===----------------------------------------------------------------------===//
>>
>> #include "llvm/DebugInfo/DWARF/DWARFDie.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/SmallSet.h"
>> #include "llvm/ADT/StringRef.h"
>> #include "llvm/BinaryFormat/Dwarf.h"
>>
>> diff --git a/llvm/lib/IR/AsmWriter.cpp b/llvm/lib/IR/AsmWriter.cpp
>> index 3ca17648a7032..c2ad095a7f387 100644
>> --- a/llvm/lib/IR/AsmWriter.cpp
>> +++ b/llvm/lib/IR/AsmWriter.cpp
>> @@ -19,7 +19,6 @@
>> #include "llvm/ADT/APInt.h"
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseMap.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SetVector.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>>
>> diff --git a/llvm/lib/IR/ConstantsContext.h
>> b/llvm/lib/IR/ConstantsContext.h
>> index 0363ea1c03c97..fbda443de7b2a 100644
>> --- a/llvm/lib/IR/ConstantsContext.h
>> +++ b/llvm/lib/IR/ConstantsContext.h
>> @@ -18,7 +18,6 @@
>> #include "llvm/ADT/DenseMapInfo.h"
>> #include "llvm/ADT/DenseSet.h"
>> #include "llvm/ADT/Hashing.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include "llvm/ADT/StringRef.h"
>> #include "llvm/IR/Constant.h"
>>
>> diff --git a/llvm/lib/IR/Function.cpp b/llvm/lib/IR/Function.cpp
>> index 792e714b62fc0..f7a77512ba702 100644
>> --- a/llvm/lib/IR/Function.cpp
>> +++ b/llvm/lib/IR/Function.cpp
>> @@ -14,7 +14,6 @@
>> #include "SymbolTableListTraitsImpl.h"
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseSet.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallString.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git a/llvm/lib/IR/IRBuilder.cpp b/llvm/lib/IR/IRBuilder.cpp
>> index 2e2f360dec509..c4923bca83a55 100644
>> --- a/llvm/lib/IR/IRBuilder.cpp
>> +++ b/llvm/lib/IR/IRBuilder.cpp
>> @@ -13,7 +13,6 @@
>>
>> #include "llvm/IR/IRBuilder.h"
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/IR/Constant.h"
>> #include "llvm/IR/Constants.h"
>> #include "llvm/IR/DebugInfoMetadata.h"
>>
>> diff --git a/llvm/lib/IR/Instructions.cpp b/llvm/lib/IR/Instructions.cpp
>> index a9fc9105cd506..e266da5bb3767 100644
>> --- a/llvm/lib/IR/Instructions.cpp
>> +++ b/llvm/lib/IR/Instructions.cpp
>> @@ -13,7 +13,6 @@
>>
>> #include "llvm/IR/Instructions.h"
>> #include "LLVMContextImpl.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/SmallBitVector.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include "llvm/ADT/Twine.h"
>>
>> diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp
>> b/llvm/lib/MC/MCParser/AsmParser.cpp
>> index 05ed66658357d..b99df36c51cf9 100644
>> --- a/llvm/lib/MC/MCParser/AsmParser.cpp
>> +++ b/llvm/lib/MC/MCParser/AsmParser.cpp
>> @@ -13,7 +13,6 @@
>> #include "llvm/ADT/APFloat.h"
>> #include "llvm/ADT/APInt.h"
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallSet.h"
>> #include "llvm/ADT/SmallString.h"
>>
>> diff --git a/llvm/lib/MC/MCParser/MasmParser.cpp
>> b/llvm/lib/MC/MCParser/MasmParser.cpp
>> index 918c614f9b8db..309458eaace6e 100644
>> --- a/llvm/lib/MC/MCParser/MasmParser.cpp
>> +++ b/llvm/lib/MC/MCParser/MasmParser.cpp
>> @@ -14,7 +14,6 @@
>> #include "llvm/ADT/APInt.h"
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/BitVector.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallString.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git a/llvm/lib/Object/MachOObjectFile.cpp
>> b/llvm/lib/Object/MachOObjectFile.cpp
>> index 39e84fffcc4c6..d2d9f360e2f22 100644
>> --- a/llvm/lib/Object/MachOObjectFile.cpp
>> +++ b/llvm/lib/Object/MachOObjectFile.cpp
>> @@ -12,7 +12,6 @@
>>
>> //===----------------------------------------------------------------------===//
>>
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include "llvm/ADT/StringRef.h"
>>
>> diff --git a/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
>> b/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
>> index ac3665068ac72..cad368d557ebd 100644
>> --- a/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
>> +++ b/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
>> @@ -14,7 +14,6 @@
>> #include "llvm/ProfileData/Coverage/CoverageMapping.h"
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseMap.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/SmallBitVector.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git a/llvm/lib/Support/VirtualFileSystem.cpp
>> b/llvm/lib/Support/VirtualFileSystem.cpp
>> index ded5607e0c53e..f210143b1204c 100644
>> --- a/llvm/lib/Support/VirtualFileSystem.cpp
>> +++ b/llvm/lib/Support/VirtualFileSystem.cpp
>> @@ -14,7 +14,6 @@
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseMap.h"
>> #include "llvm/ADT/IntrusiveRefCntPtr.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallString.h"
>>
>> diff --git a/llvm/lib/Target/AArch64/AArch64StackTagging.cpp
>> b/llvm/lib/Target/AArch64/AArch64StackTagging.cpp
>> index 6af9877a64c16..15324c3e95b86 100644
>> --- a/llvm/lib/Target/AArch64/AArch64StackTagging.cpp
>> +++ b/llvm/lib/Target/AArch64/AArch64StackTagging.cpp
>> @@ -14,7 +14,6 @@
>> #include "llvm/ADT/DenseMap.h"
>> #include "llvm/ADT/DepthFirstIterator.h"
>> #include "llvm/ADT/MapVector.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include "llvm/ADT/Statistic.h"
>> #include "llvm/Analysis/AliasAnalysis.h"
>>
>> diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
>> b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
>> index b06e89f0ed9f1..21e3cd97215f0 100644
>> --- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
>> +++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
>> @@ -17,7 +17,6 @@
>> #include "Utils/ARMBaseInfo.h"
>> #include "llvm/ADT/APFloat.h"
>> #include "llvm/ADT/APInt.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallSet.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git a/llvm/lib/Target/Hexagon/HexagonFrameLowering.cpp
>> b/llvm/lib/Target/Hexagon/HexagonFrameLowering.cpp
>> index 381ac55e1f2b4..ebaef10157d33 100644
>> --- a/llvm/lib/Target/Hexagon/HexagonFrameLowering.cpp
>> +++ b/llvm/lib/Target/Hexagon/HexagonFrameLowering.cpp
>> @@ -17,7 +17,6 @@
>> #include "MCTargetDesc/HexagonBaseInfo.h"
>> #include "llvm/ADT/BitVector.h"
>> #include "llvm/ADT/DenseMap.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/PostOrderIterator.h"
>> #include "llvm/ADT/SetVector.h"
>> #include "llvm/ADT/SmallSet.h"
>>
>> diff --git a/llvm/lib/Target/Hexagon/HexagonVectorCombine.cpp
>> b/llvm/lib/Target/Hexagon/HexagonVectorCombine.cpp
>> index 279ff739cca6e..3644316c58bc8 100644
>> --- a/llvm/lib/Target/Hexagon/HexagonVectorCombine.cpp
>> +++ b/llvm/lib/Target/Hexagon/HexagonVectorCombine.cpp
>> @@ -14,7 +14,6 @@
>> #include "llvm/ADT/APInt.h"
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseMap.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallVector.h"
>> #include "llvm/Analysis/AliasAnalysis.h"
>>
>> diff --git a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
>> b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
>> index 00f6b1366f53b..f15e653dd93aa 100644
>> --- a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
>> +++ b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
>> @@ -26,7 +26,6 @@
>> #include "llvm/ADT/APInt.h"
>> #include "llvm/ADT/ArrayRef.h"
>> #include "llvm/ADT/DenseMap.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>> #include "llvm/ADT/SmallSet.h"
>>
>> diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
>> b/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
>> index bdcf087efe4c4..11e5d2a2089e4 100644
>> --- a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
>> +++ b/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
>> @@ -15,7 +15,6 @@
>> #include "llvm/ADT/APInt.h"
>> #include "llvm/ADT/APSInt.h"
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLFunctionalExtras.h"
>> #include "llvm/ADT/SmallBitVector.h"
>>
>> diff --git a/llvm/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
>> b/llvm/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
>> index d98b15f4626fe..927f3898c9c49 100644
>> --- a/llvm/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
>> +++ b/llvm/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
>> @@ -31,7 +31,6 @@
>> #include "ProvenanceAnalysis.h"
>> #include "PtrState.h"
>> #include "llvm/ADT/DenseMap.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>> #include "llvm/ADT/SmallVector.h"
>>
>> diff --git a/llvm/lib/Transforms/Scalar/GVNSink.cpp
>> b/llvm/lib/Transforms/Scalar/GVNSink.cpp
>> index b44f20addd5a8..69cffdbff549b 100644
>> --- a/llvm/lib/Transforms/Scalar/GVNSink.cpp
>> +++ b/llvm/lib/Transforms/Scalar/GVNSink.cpp
>> @@ -37,7 +37,6 @@
>> #include "llvm/ADT/DenseMap.h"
>> #include "llvm/ADT/DenseSet.h"
>> #include "llvm/ADT/Hashing.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/PostOrderIterator.h"
>> #include "llvm/ADT/STLExtras.h"
>>
>> diff --git
>> a/llvm/lib/Transforms/Scalar/InductiveRangeCheckElimination.cpp
>> b/llvm/lib/Transforms/Scalar/InductiveRangeCheckElimination.cpp
>> index e7ffbc33abef8..ea4b7165317ee 100644
>> --- a/llvm/lib/Transforms/Scalar/InductiveRangeCheckElimination.cpp
>> +++ b/llvm/lib/Transforms/Scalar/InductiveRangeCheckElimination.cpp
>> @@ -45,7 +45,6 @@
>> #include "llvm/Transforms/Scalar/InductiveRangeCheckElimination.h"
>> #include "llvm/ADT/APInt.h"
>> #include "llvm/ADT/ArrayRef.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/PriorityWorklist.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>>
>> diff --git a/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp
>> b/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp
>> index 1b7b9d9003ccf..84705570dee39 100644
>> --- a/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp
>> +++ b/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp
>> @@ -15,7 +15,6 @@
>> #include "llvm/ADT/DenseMap.h"
>> #include "llvm/ADT/DenseMapInfo.h"
>> #include "llvm/ADT/DenseSet.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SetVector.h"
>>
>> diff --git a/llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
>> b/llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
>> index 9bd4387edbe1d..b42546e05cedf 100644
>> --- a/llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
>> +++ b/llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
>> @@ -17,7 +17,6 @@
>> #include "llvm/ADT/DenseMap.h"
>> #include "llvm/ADT/DenseSet.h"
>> #include "llvm/ADT/MapVector.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SetVector.h"
>>
>> diff --git a/llvm/lib/Transforms/Utils/InlineFunction.cpp
>> b/llvm/lib/Transforms/Utils/InlineFunction.cpp
>> index 56141388c996c..411ccc2c9b823 100644
>> --- a/llvm/lib/Transforms/Utils/InlineFunction.cpp
>> +++ b/llvm/lib/Transforms/Utils/InlineFunction.cpp
>> @@ -12,7 +12,6 @@
>>
>> //===----------------------------------------------------------------------===//
>>
>> #include "llvm/ADT/DenseMap.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SetVector.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>>
>> diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
>> b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
>> index 9805a845d99a8..f3d26507fc350 100644
>> --- a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
>> +++ b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
>> @@ -65,7 +65,6 @@
>> #include "llvm/ADT/DenseMapInfo.h"
>> #include "llvm/ADT/Hashing.h"
>> #include "llvm/ADT/MapVector.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/STLExtras.h"
>> #include "llvm/ADT/SmallPtrSet.h"
>>
>> diff --git a/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp
>> b/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp
>> index d4fa73fc0f9ae..16e608bf81c3e 100644
>> --- a/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp
>> +++ b/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp
>> @@ -18,7 +18,6 @@
>> #include "llvm/ADT/DenseSet.h"
>> #include "llvm/ADT/FoldingSet.h"
>> #include "llvm/ADT/Hashing.h"
>> -#include "llvm/ADT/None.h"
>> #include "llvm/ADT/Optional.h"
>> #include "llvm/ADT/PointerIntPair.h"
>> #include "llvm/ADT/STLExtras.h"
>>
>>
>>
>> _______________________________________________
>> cfe-commits mailing list
>> cfe-commits at lists.llvm.org
>>
>> https://urldefense.com/v3/__https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits__;!!JmoZiZGBv3RvKRSx!-wSCRml8NKZ6L_rFklXVIa3eZ-9Oj9ghkmY_pDw3qu_F5kgPjlairS6IxzEhDrh1PHN6EmJeDNagyNtcXt74ty1t8cs$
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20221210/e6711a87/attachment-0001.html>
More information about the cfe-commits
mailing list