Use LLVM definitions for Swift section names (NFC)

include/swift/ABI/ObjectFile.h

@@ -9,10 +9,12 @@
 
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/ADT/Optional.h"
 
 namespace swift {
 
-/// Represents the nine reflection sections used by Swift
+/// Represents the nine reflection sections used by Swift + the Swift AST
+/// section used by the debugger.
 enum ReflectionSectionKind : uint8_t {
 #define HANDLE_SWIFT_SECTION(KIND, MACHO, ELF, COFF) KIND,
 #include "llvm/BinaryFormat/Swift.def"

lib/ASTSectionImporter/ASTSectionImporter.cpp

@@ -18,7 +18,6 @@
 #include "swift/ASTSectionImporter/ASTSectionImporter.h"
 #include "../Serialization/ModuleFormat.h"
 #include "swift/AST/ASTContext.h"
-#include "swift/Basic/Dwarf.h"
 #include "swift/Serialization/SerializedModuleLoader.h"
 #include "swift/Serialization/Validation.h"
 #include "llvm/Support/Debug.h"

lib/Driver/DarwinToolChains.cpp

@@ -14,7 +14,6 @@
 
 #include "swift/AST/DiagnosticsDriver.h"
 #include "swift/AST/PlatformKind.h"
-#include "swift/Basic/Dwarf.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/Platform.h"
 #include "swift/Basic/Range.h"

lib/Driver/ToolChains.cpp

@@ -13,7 +13,6 @@
 #include "ToolChains.h"
 
 #include "swift/AST/DiagnosticsDriver.h"
-#include "swift/Basic/Dwarf.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/Platform.h"
 #include "swift/Basic/Range.h"

lib/Driver/UnixToolChains.cpp

@@ -12,7 +12,6 @@
 
 #include "ToolChains.h"
 
-#include "swift/Basic/Dwarf.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/Platform.h"
 #include "swift/Basic/Range.h"

lib/Driver/WindowsToolChains.cpp

@@ -12,7 +12,6 @@
 
 #include "ToolChains.h"
 
-#include "swift/Basic/Dwarf.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/Platform.h"
 #include "swift/Basic/Range.h"

lib/FrontendTool/FrontendTool.cpp

@@ -36,7 +36,6 @@
 #include "swift/AST/TBDGenRequests.h"
 #include "swift/AST/TypeRefinementContext.h"
 #include "swift/Basic/Defer.h"
-#include "swift/Basic/Dwarf.h"
 #include "swift/Basic/Edit.h"
 #include "swift/Basic/FileSystem.h"
 #include "swift/Basic/LLVMInitialize.h"
@@ -2240,10 +2239,6 @@ int swift::performFrontend(ArrayRef<const char *> Args,
              trace.emplace(*buffer);
            });
 
-  // Setting DWARF Version depend on platform
-  IRGenOptions &IRGenOpts = Invocation.getIRGenOptions();
-  IRGenOpts.DWARFVersion = swift::DWARFVersion;
-
   // The compiler invocation is now fully configured; notify our observer.
   if (observer) {
     observer->parsedArgs(Invocation);

lib/IRGen/IRGen.cpp

@@ -17,6 +17,7 @@
 #include "../Serialization/ModuleFormat.h"
 #include "IRGenModule.h"
 #include "swift/ABI/MetadataValues.h"
+#include "swift/ABI/ObjectFile.h"
 #include "swift/AST/DiagnosticsIRGen.h"
 #include "swift/AST/IRGenOptions.h"
 #include "swift/AST/IRGenRequests.h"
@@ -26,7 +27,6 @@
 #include "swift/AST/SILOptimizerRequests.h"
 #include "swift/AST/TBDGenRequests.h"
 #include "swift/Basic/Defer.h"
-#include "swift/Basic/Dwarf.h"
 #include "swift/Basic/MD5Stream.h"
 #include "swift/Basic/Platform.h"
 #include "swift/Basic/Statistic.h"
@@ -1616,6 +1616,7 @@ void swift::createSwiftModuleObjectFile(SILModule &SILMod, StringRef Buffer,
   auto *ASTSym = new llvm::GlobalVariable(M, Ty, /*constant*/ true,
                                           llvm::GlobalVariable::InternalLinkage,
                                           Data, "__Swift_AST");
+
   std::string Section;
   switch (IGM.TargetInfo.OutputObjectFormat) {
   case llvm::Triple::DXContainer:
@@ -1624,19 +1625,24 @@ void swift::createSwiftModuleObjectFile(SILModule &SILMod, StringRef Buffer,
   case llvm::Triple::UnknownObjectFormat:
     llvm_unreachable("unknown object format");
   case llvm::Triple::XCOFF:
-  case llvm::Triple::COFF:
-    Section = COFFASTSectionName;
+  case llvm::Triple::COFF: {
+    SwiftObjectFileFormatCOFF COFF;
+    Section = COFF.getSectionName(ReflectionSectionKind::swiftast);
     break;
+  }
   case llvm::Triple::ELF:
-    Section = ELFASTSectionName;
-    break;
-  case llvm::Triple::MachO:
-    Section = std::string(MachOASTSegmentName) + "," + MachOASTSectionName;
+  case llvm::Triple::Wasm: {
+    SwiftObjectFileFormatELF ELF;
+    Section = ELF.getSectionName(ReflectionSectionKind::swiftast);
     break;
-  case llvm::Triple::Wasm:
-    Section = WasmASTSectionName;
+  }
+  case llvm::Triple::MachO: {
+    SwiftObjectFileFormatMachO MachO;
+    Section = std::string(*MachO.getSegmentName()) + "," +
+              MachO.getSectionName(ReflectionSectionKind::swiftast).str();
     break;
   }
+  }
   ASTSym->setSection(Section);
   ASTSym->setAlignment(llvm::MaybeAlign(serialization::SWIFTMODULE_ALIGNMENT));
   ::performLLVM(Opts, Ctx.Diags, nullptr, nullptr, IGM.getModule(),

lib/IRGen/IRGenDebugInfo.cpp

@@ -29,7 +29,6 @@
 #include "swift/AST/Pattern.h"
 #include "swift/AST/TypeDifferenceVisitor.h"
 #include "swift/Basic/Compiler.h"
-#include "swift/Basic/Dwarf.h"
 #include "swift/Basic/SourceManager.h"
 #include "swift/Basic/Version.h"
 #include "swift/ClangImporter/ClangImporter.h"

lib/IRGen/IRGenModule.cpp

@@ -21,7 +21,6 @@
 #include "swift/AST/GenericSignature.h"
 #include "swift/AST/IRGenOptions.h"
 #include "swift/AST/IRGenRequests.h"
-#include "swift/Basic/Dwarf.h"
 #include "swift/Demangling/ManglingMacros.h"
 #include "swift/ClangImporter/ClangImporter.h"
 #include "swift/IRGen/IRGenPublic.h"

lib/Serialization/Serialization.cpp

@@ -40,7 +40,6 @@
 #include "swift/AST/TypeCheckRequests.h"
 #include "swift/AST/TypeVisitor.h"
 #include "swift/Basic/Defer.h"
-#include "swift/Basic/Dwarf.h"
 #include "swift/Basic/FileSystem.h"
 #include "swift/Basic/PathRemapper.h"
 #include "swift/Basic/STLExtras.h"

tools/lldb-moduleimport-test/lldb-moduleimport-test.cpp

@@ -16,27 +16,27 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "swift/ABI/ObjectFile.h"
 #include "swift/AST/ASTDemangler.h"
 #include "swift/AST/PrintOptions.h"
 #include "swift/ASTSectionImporter/ASTSectionImporter.h"
+#include "swift/Basic/LLVMInitialize.h"
 #include "swift/Frontend/Frontend.h"
 #include "swift/Serialization/SerializedModuleLoader.h"
 #include "swift/Serialization/Validation.h"
-#include "swift/Basic/Dwarf.h"
-#include "llvm/Object/ELFObjectFile.h"
-#include "swift/Basic/LLVMInitialize.h"
 #include "llvm/Object/COFF.h"
+#include "llvm/Object/ELFObjectFile.h"
 #include "llvm/Object/MachO.h"
 #include "llvm/Object/ObjectFile.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/FileSystem.h"
+#include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/Support/Signals.h"
 #include "llvm/Support/TargetSelect.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/Support/ManagedStatic.h"
 #include <fstream>
 #include <sstream>
 
@@ -209,15 +209,19 @@ collectASTModules(llvm::cl::list<std::string> &InputNames,
         continue;
       }
       llvm::StringRef Name = *NameOrErr;
-      if ((MachO && Name == swift::MachOASTSectionName) ||
-          (ELF && Name == swift::ELFASTSectionName) ||
-          (COFF && Name == swift::COFFASTSectionName)) {
+      if ((MachO && Name == swift::SwiftObjectFileFormatMachO().getSectionName(
+                                swift::ReflectionSectionKind::swiftast)) ||
+          (ELF && Name == swift::SwiftObjectFileFormatELF().getSectionName(
+                              swift::ReflectionSectionKind::swiftast)) ||
+          (COFF && Name == swift::SwiftObjectFileFormatCOFF().getSectionName(
+                               swift::ReflectionSectionKind::swiftast))) {
         uint64_t Size = Section.getSize();
 
-        llvm::Expected<llvm::StringRef> ContentsReference = Section.getContents();
+        llvm::Expected<llvm::StringRef> ContentsReference =
+            Section.getContents();
         if (!ContentsReference) {
           llvm::errs() << "error: " << name << " "
-            << errorToErrorCode(OF.takeError()).message() << "\n";
+                       << errorToErrorCode(OF.takeError()).message() << "\n";
           return false;
         }
         char *Module = Alloc.Allocate<char>(Size);