stub -> dosStub and parseStub -> parseDosStub

Author: kkent030315

lld/COFF/Config.h

@@ -115,7 +115,7 @@ struct Configuration {
   enum ManifestKind { Default, SideBySide, Embed, No };
   bool is64() const { return llvm::COFF::is64Bit(machine); }
 
-  std::unique_ptr<MemoryBuffer> stub;
+  std::unique_ptr<MemoryBuffer> dosStub;
   llvm::COFF::MachineTypes machine = IMAGE_FILE_MACHINE_UNKNOWN;
   bool machineInferred = false;
   size_t wordsize;

lld/COFF/Driver.cpp

@@ -2420,7 +2420,7 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
 
   // Handle /stub
   if (auto *arg = args.getLastArg(OPT_stub))
-    parseStub(arg->getValue());
+    parseDosStub(arg->getValue());
 
   // Handle /functionpadmin
   for (auto *arg : args.filtered(OPT_functionpadmin, OPT_functionpadmin_opt))

lld/COFF/Driver.h

@@ -237,7 +237,7 @@ class LinkerDriver {
   void parseAligncomm(StringRef);
 
   // Parses a MS-DOS stub file
-  void parseStub(StringRef path);
+  void parseDosStub(StringRef path);
 
   // Parses a string in the form of "[:<integer>]"
   void parseFunctionPadMin(llvm::opt::Arg *a);

lld/COFF/DriverUtils.cpp

@@ -246,7 +246,7 @@ void LinkerDriver::parseAligncomm(StringRef s) {
       std::max(ctx.config.alignComm[std::string(name)], 1 << v);
 }
 
-void LinkerDriver::parseStub(StringRef path) {
+void LinkerDriver::parseDosStub(StringRef path) {
   std::unique_ptr<MemoryBuffer> stub =
       CHECK(MemoryBuffer::getFile(path), "could not open " + path);
   size_t bufferSize = stub->getBufferSize();
@@ -262,7 +262,7 @@ void LinkerDriver::parseStub(StringRef path) {
     Err(ctx) << "/stub: invalid DOS signature: " << path;
   if (bufferSize % 8 != 0)
     Err(ctx) << "/stub: stub must be aligned to 8 bytes: " << path;
-  ctx.config.stub = std::move(stub);
+  ctx.config.dosStub = std::move(stub);
 }
 
 // Parses /functionpadmin option argument.

lld/COFF/Writer.cpp

@@ -1037,8 +1037,8 @@ void Writer::sortSections() {
 }
 
 void Writer::calculateStubDependentSizes() {
-  if (ctx.config.stub)
-    dosStubSize = ctx.config.stub->getBufferSize();
+  if (ctx.config.dosStub)
+    dosStubSize = ctx.config.dosStub->getBufferSize();
   else
     dosStubSize = sizeof(dos_header) + sizeof(dosProgram);
 
@@ -1685,12 +1685,13 @@ template <typename PEHeaderTy> void Writer::writeHeader() {
   auto *dos = reinterpret_cast<dos_header *>(buf);
 
   // Write DOS program.
-  if (config->stub) {
-    memcpy(buf, config->stub->getBufferStart(), config->stub->getBufferSize());
+  if (config->dosStub) {
+    memcpy(buf, config->dosStub->getBufferStart(),
+           config->dosStub->getBufferSize());
     // MS link.exe accepts an invalid `e_lfanew` (AddressOfNewExeHeader) and
     // updates it automatically. Replicate the same behaviour.
-    dos->AddressOfNewExeHeader = config->stub->getBufferSize();
-    buf += config->stub->getBufferSize();
+    dos->AddressOfNewExeHeader = config->dosStub->getBufferSize();
+    buf += config->dosStub->getBufferSize();
   } else {
     buf += sizeof(dos_header);
     dos->Magic[0] = 'M';