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