Update Triple.h location

Triple moved from ADT to TargetParser. Updating includes to reflect
that.

Author: etcwilde

include/swift/AST/ASTWalker.h

@@ -15,6 +15,7 @@
 
 #include "swift/Basic/LLVM.h"
 #include "llvm/ADT/Optional.h"
+#include "llvm/ADT/None.h"
 #include "llvm/ADT/PointerUnion.h"
 #include <utility>
 

include/swift/Basic/LangOptions.h

@@ -32,7 +32,7 @@
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/Support/Regex.h"
 #include "llvm/Support/VersionTuple.h"
 #include "llvm/Support/raw_ostream.h"

include/swift/Driver/ToolChain.h

@@ -18,7 +18,7 @@
 #include "swift/Driver/Action.h"
 #include "swift/Driver/Job.h"
 #include "swift/Option/Options.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/Option/Option.h"
 
 #include <memory>

include/swift/Option/SanitizerOptions.h

@@ -15,7 +15,7 @@
 
 #include "swift/Basic/Sanitizers.h"
 #include "swift/Basic/OptionSet.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/Option/Arg.h"
 #include "llvm/Option/ArgList.h"
 // FIXME: This include is just for llvm::SanitizerCoverageOptions. We should

include/swift/SymbolGraphGen/SymbolGraphOptions.h

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "swift/AST/AttrKind.h"
 
 #ifndef SWIFT_SYMBOLGRAPHGEN_SYMBOLGRAPHOPTIONS_H

lib/Basic/CMakeLists.txt

@@ -90,7 +90,7 @@ add_swift_host_library(swiftBasic STATIC
   # Platform-agnostic fallback TaskQueue implementation
   Default/TaskQueue.inc
 
-  LLVM_LINK_COMPONENTS support)
+  LLVM_LINK_COMPONENTS support targetparser)
 _swift_gyb_target_sources(swiftBasic PRIVATE
     UnicodeExtendedGraphemeClusters.cpp.gyb)
 

lib/Basic/Platform.cpp

@@ -13,7 +13,7 @@
 #include "swift/Basic/Platform.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringSwitch.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/Support/VersionTuple.h"
 
 using namespace swift;

lib/DriverTool/driver.cpp

@@ -32,7 +32,7 @@
 #include "swift/FrontendTool/FrontendTool.h"
 #include "swift/DriverTool/DriverTool.h"
 #include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ConvertUTF.h"
 #include "llvm/Support/Errno.h"

lib/DriverTool/swift_llvm_opt_main.cpp

@@ -28,7 +28,7 @@
 #include "swift/LLVMPasses/PassesFwd.h"
 #include "swift/LLVMPasses/Passes.h"
 #include "llvm/ADT/Statistic.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/Analysis/CallGraph.h"
 #include "llvm/Analysis/CallGraphSCCPass.h"
 #include "llvm/Analysis/LoopPass.h"

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

@@ -22,7 +22,7 @@
 #include "swift/Parse/Lexer.h"
 #include "swift/Strings.h"
 #include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/CAS/ObjectStore.h"
 #include "llvm/Option/Arg.h"
 #include "llvm/Option/ArgList.h"

lib/Frontend/ArgsToFrontendOutputsConverter.cpp

@@ -21,7 +21,7 @@
 #include "swift/Option/SanitizerOptions.h"
 #include "swift/Strings.h"
 #include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/Option/Arg.h"
 #include "llvm/Option/ArgList.h"
 #include "llvm/Option/Option.h"

lib/Frontend/CompilerInvocation.cpp

@@ -23,7 +23,7 @@
 #include "swift/Strings.h"
 #include "swift/SymbolGraphGen/SymbolGraphOptions.h"
 #include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/Option/Arg.h"
 #include "llvm/Option/ArgList.h"
 #include "llvm/Option/Option.h"

lib/Frontend/Frontend.cpp

@@ -43,7 +43,7 @@
 #include "llvm/ADT/Hashing.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
 #include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/CAS/ActionCache.h"
 #include "llvm/CAS/BuiltinUnifiedCASDatabases.h"
 #include "llvm/CAS/CASFileSystem.h"

lib/IRGen/APIGen.h

@@ -18,7 +18,7 @@
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/StringSet.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/Error.h"
 

lib/IRGen/CMakeLists.txt

@@ -70,6 +70,7 @@ add_swift_host_library(swiftIRGen STATIC
 
   LLVM_LINK_COMPONENTS
     target
+    targetparser
     transformutils
 )
 target_link_libraries(swiftIRGen INTERFACE

lib/IRGen/Linking.cpp

@@ -22,7 +22,7 @@
 #include "swift/ClangImporter/ClangModule.h"
 #include "swift/SIL/SILGlobalVariable.h"
 #include "swift/SIL/FormalLinkage.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/raw_ostream.h"
 

lib/IRGen/SwiftTargetInfo.cpp

@@ -17,7 +17,7 @@
 
 #include "SwiftTargetInfo.h"
 #include "IRGenModule.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/IR/DataLayout.h"
 #include "swift/ABI/System.h"
 #include "swift/AST/ASTContext.h"

lib/IRGen/SwiftTargetInfo.h

@@ -20,7 +20,7 @@
 
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/ClusteredBitVector.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "IRGen.h"
 
 namespace swift {

lib/IRGen/TBDGenVisitor.h

@@ -24,7 +24,7 @@
 #include "swift/IRGen/Linking.h"
 #include "swift/SIL/SILDeclRef.h"
 #include "llvm/ADT/StringSet.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/TextAPI/InterfaceFile.h"
 
 using namespace swift::irgen;

lib/LLVMPasses/ARCEntryPointBuilder.h

@@ -18,7 +18,7 @@
 #include "swift/Runtime/Config.h"
 #include "swift/Runtime/RuntimeFnWrappersGen.h"
 #include "llvm/ADT/APInt.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/IR/Module.h"
 

lib/LLVMPasses/CMakeLists.txt

@@ -10,6 +10,7 @@ add_swift_host_library(swiftLLVMPasses STATIC
 
   LLVM_LINK_COMPONENTS
   analysis
+  targetparser
   )
 target_link_libraries(swiftLLVMPasses PRIVATE
   swiftDemangling)

lib/LLVMPasses/LLVMARCOpts.cpp

@@ -37,7 +37,7 @@
 #include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/ADT/TinyPtrVector.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/IR/InstIterator.h"
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/Support/raw_ostream.h"

lib/LLVMPasses/LLVMMergeFunctions.cpp

@@ -39,7 +39,7 @@
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/Hashing.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/IR/Attributes.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DataLayout.h"

lib/Option/SanitizerOptions.cpp

@@ -25,7 +25,7 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/StringSwitch.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 
 using namespace swift;
 

lib/SymbolGraphGen/CMakeLists.txt

@@ -6,7 +6,11 @@ add_swift_host_library(swiftSymbolGraphGen STATIC
   Symbol.cpp
   SymbolGraph.cpp
   SymbolGraphGen.cpp
-  SymbolGraphASTWalker.cpp)
+  SymbolGraphASTWalker.cpp
+
+  LLVM_LINK_COMPONENTS
+  TargetParser
+  )
 
 target_link_libraries(swiftSymbolGraphGen PRIVATE
   swiftAST

lib/SymbolGraphGen/JSON.h

@@ -15,7 +15,7 @@
 #ifndef SWIFT_SYMBOLGRAPHGEN_JSON_H
 #define SWIFT_SYMBOLGRAPHGEN_JSON_H
 
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/Support/JSON.h"
 #include "llvm/Support/VersionTuple.h"
 #include "swift/AST/GenericSignature.h"

unittests/DependencyScan/ModuleDeps.cpp

@@ -13,7 +13,7 @@
 #include "ScanFixture.h"
 #include "swift/Basic/Platform.h"
 #include "swift/Basic/Defer.h"
-#include "llvm/ADT/Triple.h"
+#include "llvm/TargetParser/Triple.h"
 #include "llvm/Support/Host.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/raw_ostream.h"