[LLD] [COFF] Move MinGW specific functions/classes to a separate file. NFC.

[ruiu]

LLVM with these style changes.

COFF/MinGW.cpp

19–20 ↗

(On Diff #119517)

Instead of enclosing the entire file with namespace, add coff:: to non-static functions just like we do in ELF.

COFF/MinGW.h

21 ↗

(On Diff #119517)

Instead of doing this, please include LLVM.h just like other headers in lld do.

[mstorsjo]

COFF/MinGW.h

21 ↗

(On Diff #119517)

LLVM.h doesn't include or forward-declare StringSet, but if I add it there, I can get this working (as long as any caller trying to instantiate the AutoExporter class has pulled in the proper definition of StringSet).

[mstorsjo]

Removed the whole-file namespace in MinGW.cpp, removed manual includes of ADT types in MinGW.h and added a forward declaration to LLVM.h.

[ruiu]

LGTM

[mstorsjo]

FWIW, the StringSet forward declaration turned out to fail on clang while it worked fine when built with GCC, see e.g. http://lab.llvm.org:8011/builders/lld-x86_64-freebsd/builds/11694/steps/build_Lld/logs/stdio (https://godbolt.org/g/czUQZ8 for a simplified example of the issue). I did a quick fix by removing the forward declaration again and using the fully qualified llvm::StringSet in MinGW.h (instead of the using statement that you weren't so fond of earlier in review).

lld/trunk/COFF/CMakeLists.txt

add_lld_library(lldCOFF
   Driver.cpp
   DriverUtils.cpp
   Error.cpp
   ICF.cpp
   InputFiles.cpp
   LTO.cpp
   MapFile.cpp
   MarkLive.cpp
+  MinGW.cpp
   PDB.cpp
   Strings.cpp
   SymbolTable.cpp
   Symbols.cpp
   Writer.cpp
 
   LINK_COMPONENTS
   ${LLVM_TARGETS_TO_BUILD}

lld/trunk/COFF/Driver.cpp

 //===- Driver.cpp ---------------------------------------------------------===//
 //
 //                             The LLVM Linker
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "Driver.h"
 #include "Config.h"
 #include "Error.h"
 #include "InputFiles.h"
 #include "Memory.h"
+#include "MinGW.h"
 #include "SymbolTable.h"
 #include "Symbols.h"
 #include "Writer.h"
 #include "lld/Common/Driver.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/BinaryFormat/Magic.h"
 #include "llvm/Object/ArchiveWriter.h"
for (COFFShortExport E1 : M.Exports) {
     E2.Noname = E1.Noname;
     E2.Data = E1.Data;
     E2.Private = E1.Private;
     E2.Constant = E1.Constant;
     Config->Exports.push_back(E2);
   }
 }
 
-// Logic for deciding what symbols to export, when exporting all
-// symbols for MinGW.
-class AutoExporter {
-public:
-  AutoExporter() {
-    if (Config->Machine == I386)
-      ExcludeSymbols = {
-          "__NULL_IMPORT_DESCRIPTOR",
-          "__pei386_runtime_relocator",
-          "_do_pseudo_reloc",
-          "_impure_ptr",
-          "__impure_ptr",
-          "__fmode",
-          "_environ",
-          "___dso_handle",
-          // These are the MinGW names that differ from the standard
-          // ones (lacking an extra underscore).
-          "_DllMain@12",
-          "_DllEntryPoint@12",
-          "_DllMainCRTStartup@12",
-      };
-    else
-      ExcludeSymbols = {
-          "_NULL_IMPORT_DESCRIPTOR",
-          "_pei386_runtime_relocator",
-          "do_pseudo_reloc",
-          "impure_ptr",
-          "_impure_ptr",
-          "_fmode",
-          "environ",
-          "__dso_handle",
-          // These are the MinGW names that differ from the standard
-          // ones (lacking an extra underscore).
-          "DllMain",
-          "DllEntryPoint",
-          "DllMainCRTStartup",
-      };
-  }
-
-  StringSet<> ExcludeSymbols;
-  StringSet<> ExcludeLibs = {
-      "libgcc",
-      "libgcc_s",
-      "libstdc++",
-      "libmingw32",
-      "libmingwex",
-      "libg2c",
-      "libsupc++",
-      "libobjc",
-      "libgcj",
-      "libclang_rt.builtins-aarch64",
-      "libclang_rt.builtins-arm",
-      "libclang_rt.builtins-i386",
-      "libclang_rt.builtins-x86_64",
-  };
-  StringSet<> ExcludeObjects = {
-      "crt0.o",
-      "crt1.o",
-      "crt1u.o",
-      "crt2.o",
-      "crt2u.o",
-      "dllcrt1.o",
-      "dllcrt2.o",
-      "gcrt0.o",
-      "gcrt1.o",
-      "gcrt2.o",
-      "crtbegin.o",
-      "crtend.o",
-  };
-
-  bool shouldExport(Defined *Sym) const {
-    if (!Sym || !Sym->isLive() || !Sym->getChunk())
-      return false;
-    if (ExcludeSymbols.count(Sym->getName()))
-      return false;
-    StringRef LibName = sys::path::filename(Sym->getFile()->ParentName);
-    // Drop the file extension.
-    LibName = LibName.substr(0, LibName.rfind('.'));
-    if (ExcludeLibs.count(LibName))
-      return false;
-    StringRef FileName = sys::path::filename(Sym->getFile()->getName());
-    if (LibName.empty() && ExcludeObjects.count(FileName))
-      return false;
-    return true;
-  }
-};
-
-// This is MinGW specific.
-static void writeDefFile(StringRef Name) {
-  std::error_code EC;
-  raw_fd_ostream OS(Name, EC, sys::fs::F_None);
-  if (EC)
-    fatal("cannot open " + Name + ": " + EC.message());
-
-  OS << "EXPORTS\n";
-  for (Export &E : Config->Exports) {
-    OS << "    " << E.ExportName << " "
-       << "@" << E.Ordinal;
-    if (auto *Def = dyn_cast_or_null<Defined>(E.Sym)) {
-      if (Def && Def->getChunk() &&
-          !(Def->getChunk()->getPermissions() & IMAGE_SCN_MEM_EXECUTE))
-        OS << " DATA";
-    }
-    OS << "\n";
-  }
-}
-
 // A helper function for filterBitcodeFiles.
 static bool needsRebuilding(MemoryBufferRef MB) {
   // The MSVC linker doesn't support thin archives, so if it's a thin
   // archive, we always need to rebuild it.
   std::unique_ptr<Archive> File =
       check(Archive::create(MB), "Failed to read " + MB.getBufferIdentifier());
   if (File->isThin())
     return true;

lld/trunk/COFF/MinGW.h

+//===- MinGW.h --------------------------------------------------*- C++ -*-===//
+//
+//                             The LLVM Linker
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLD_COFF_MINGW_H
+#define LLD_COFF_MINGW_H
+
+#include "Config.h"
+#include "Symbols.h"
+#include "lld/Common/LLVM.h"
+
+namespace lld {
+namespace coff {
+
+// Logic for deciding what symbols to export, when exporting all
+// symbols for MinGW.
+class AutoExporter {
+public:
+  AutoExporter();
+
+  StringSet<> ExcludeSymbols;
+  StringSet<> ExcludeLibs;
+  StringSet<> ExcludeObjects;
+
+  bool shouldExport(Defined *Sym) const;
+};
+
+void writeDefFile(StringRef Name);
+
+} // namespace coff
+} // namespace lld
+
+#endif

lld/trunk/COFF/MinGW.cpp

+//===- MinGW.cpp ----------------------------------------------------------===//
+//
+//                             The LLVM Linker
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "MinGW.h"
+#include "Error.h"
+#include "llvm/Object/COFF.h"
+#include "llvm/Support/Path.h"
+#include "llvm/Support/raw_ostream.h"
+
+using namespace lld;
+using namespace lld::coff;
+using namespace llvm;
+using namespace llvm::COFF;
+
+AutoExporter::AutoExporter() {
+  if (Config->Machine == I386)
+    ExcludeSymbols = {
+        "__NULL_IMPORT_DESCRIPTOR",
+        "__pei386_runtime_relocator",
+        "_do_pseudo_reloc",
+        "_impure_ptr",
+        "__impure_ptr",
+        "__fmode",
+        "_environ",
+        "___dso_handle",
+        // These are the MinGW names that differ from the standard
+        // ones (lacking an extra underscore).
+        "_DllMain@12",
+        "_DllEntryPoint@12",
+        "_DllMainCRTStartup@12",
+    };
+  else
+    ExcludeSymbols = {
+        "_NULL_IMPORT_DESCRIPTOR",
+        "_pei386_runtime_relocator",
+        "do_pseudo_reloc",
+        "impure_ptr",
+        "_impure_ptr",
+        "_fmode",
+        "environ",
+        "__dso_handle",
+        // These are the MinGW names that differ from the standard
+        // ones (lacking an extra underscore).
+        "DllMain",
+        "DllEntryPoint",
+        "DllMainCRTStartup",
+    };
+
+  ExcludeLibs = {
+      "libgcc",
+      "libgcc_s",
+      "libstdc++",
+      "libmingw32",
+      "libmingwex",
+      "libg2c",
+      "libsupc++",
+      "libobjc",
+      "libgcj",
+      "libclang_rt.builtins-aarch64",
+      "libclang_rt.builtins-arm",
+      "libclang_rt.builtins-i386",
+      "libclang_rt.builtins-x86_64",
+  };
+  ExcludeObjects = {
+      "crt0.o",
+      "crt1.o",
+      "crt1u.o",
+      "crt2.o",
+      "crt2u.o",
+      "dllcrt1.o",
+      "dllcrt2.o",
+      "gcrt0.o",
+      "gcrt1.o",
+      "gcrt2.o",
+      "crtbegin.o",
+      "crtend.o",
+  };
+}
+
+bool AutoExporter::shouldExport(Defined *Sym) const {
+  if (!Sym || !Sym->isLive() || !Sym->getChunk())
+    return false;
+  if (ExcludeSymbols.count(Sym->getName()))
+    return false;
+  StringRef LibName = sys::path::filename(Sym->getFile()->ParentName);
+  // Drop the file extension.
+  LibName = LibName.substr(0, LibName.rfind('.'));
+  if (ExcludeLibs.count(LibName))
+    return false;
+  StringRef FileName = sys::path::filename(Sym->getFile()->getName());
+  if (LibName.empty() && ExcludeObjects.count(FileName))
+    return false;
+  return true;
+}
+
+void coff::writeDefFile(StringRef Name) {
+  std::error_code EC;
+  raw_fd_ostream OS(Name, EC, sys::fs::F_None);
+  if (EC)
+    fatal("cannot open " + Name + ": " + EC.message());
+
+  OS << "EXPORTS\n";
+  for (Export &E : Config->Exports) {
+    OS << "    " << E.ExportName << " "
+       << "@" << E.Ordinal;
+    if (auto *Def = dyn_cast_or_null<Defined>(E.Sym)) {
+      if (Def && Def->getChunk() &&
+          !(Def->getChunk()->getPermissions() & IMAGE_SCN_MEM_EXECUTE))
+        OS << " DATA";
+    }
+    OS << "\n";
+  }
+}

lld/trunk/include/lld/Common/LLVM.h

 #include "llvm/ADT/Hashing.h"
 #include "llvm/Support/Casting.h"
 #include <utility>
 
 namespace llvm {
   // ADT's.
   class Error;
   class StringRef;
+  template<typename T> class StringSet;
   class Twine;
   class MemoryBuffer;
   class MemoryBufferRef;
   template<typename T> class ArrayRef;
   template<unsigned InternalLen> class SmallString;
   template<typename T, unsigned N> class SmallVector;
   template<typename T> class SmallVectorImpl;
 
namespace lld {
   using llvm::cast;
   using llvm::dyn_cast;
   using llvm::dyn_cast_or_null;
   using llvm::cast_or_null;
 
   // ADT's.
   using llvm::Error;
   using llvm::StringRef;
+  using llvm::StringSet;
   using llvm::Twine;
   using llvm::MemoryBuffer;
   using llvm::MemoryBufferRef;
   using llvm::ArrayRef;
   using llvm::SmallString;
   using llvm::SmallVector;
   using llvm::SmallVectorImpl;
   using llvm::SaveAndRestore;