[PATCH] D113903: [NFC][lld] Inclusive language: change master file to merged file

[Quinn Pham via Phabricator via llvm-commits]

quinnp created this revision.
Herald added a project: lld-macho.
Herald added a reviewer: lld-macho.
quinnp requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

[NFC] As part of using inclusive language within the llvm project, this patch
replaces master with merged in these comments.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D113903

Files:
  lld/lib/ReaderWriter/MachO/GOTPass.cpp
  lld/lib/ReaderWriter/MachO/ShimPass.cpp


Index: lld/lib/ReaderWriter/MachO/ShimPass.cpp
===================================================================
--- lld/lib/ReaderWriter/MachO/ShimPass.cpp
+++ lld/lib/ReaderWriter/MachO/ShimPass.cpp
@@ -78,7 +78,7 @@
                 return (l->name() < r->name());
               });
 
-    // Add all shims to master file.
+    // Add all shims to merged file.
     for (const DefinedAtom *shim : shims)
       mergedFile.addAtom(*shim);
 
Index: lld/lib/ReaderWriter/MachO/GOTPass.cpp
===================================================================
--- lld/lib/ReaderWriter/MachO/GOTPass.cpp
+++ lld/lib/ReaderWriter/MachO/GOTPass.cpp
@@ -121,7 +121,7 @@
       }
     }
 
-    // Sort and add all created GOT Atoms to master file
+    // Sort and add all created GOT Atoms to merged file
     std::vector<const GOTEntryAtom *> entries;
     entries.reserve(_targetToGOT.size());
     for (auto &it : _targetToGOT)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D113903.387272.patch
Type: text/x-patch
Size: 926 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20211115/ef4d2de1/attachment.bin>