[Mips] Rename class method merge => mergeHeaderFlags

No functional changes.

llvm-svn: 233548

3 files changed, 5 insertions, 4 deletions

diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp b/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp
index 0ef2c70b815..68138fffd0a 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.cpp
@@ -64,7 +64,8 @@ MipsELFFlagsMerger::MipsELFFlagsMerger(bool is64Bits)
 
 uint32_t MipsELFFlagsMerger::getMergedELFFlags() const { return _flags; }
 
-std::error_code MipsELFFlagsMerger::merge(uint8_t newClass, uint32_t newFlags) {
+std::error_code MipsELFFlagsMerger::mergeHeaderFlags(uint8_t newClass,
+                                                     uint32_t newFlags) {
   // Check bitness.
   if (_is64Bit != (newClass == ELFCLASS64))
     return make_dynamic_error_code(
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.h b/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.h
index 6ade86f0163..b31647e5dc5 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.h
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsELFFlagsMerger.h
@@ -22,7 +22,7 @@ public:
   uint32_t getMergedELFFlags() const;
 
   /// \brief Merge saved ELF header flags and the new set of flags.
-  std::error_code merge(uint8_t newClass, uint32_t newFlags);
+  std::error_code mergeHeaderFlags(uint8_t newClass, uint32_t newFlags);
 
 private:
   const bool _is64Bit;
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsELFReader.h b/lld/lib/ReaderWriter/ELF/Mips/MipsELFReader.h
index c9827e0e40f..ffb3b5693c9 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsELFReader.h
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsELFReader.h
@@ -43,7 +43,7 @@ public:
   loadFile(std::unique_ptr<MemoryBuffer> mb, const Registry &registry,
            std::vector<std::unique_ptr<File>> &result) const override {
     auto &hdr = *this->elfHeader(*mb);
-    if (std::error_code ec = _flagMerger.merge(hdr.getFileClass(), hdr.e_flags))
+    if (auto ec = _flagMerger.mergeHeaderFlags(hdr.getFileClass(), hdr.e_flags))
       return ec;
     return BaseReaderType::loadFile(std::move(mb), registry, result);
   }
@@ -65,7 +65,7 @@ public:
   loadFile(std::unique_ptr<MemoryBuffer> mb, const Registry &registry,
            std::vector<std::unique_ptr<File>> &result) const override {
     auto &hdr = *this->elfHeader(*mb);
-    if (std::error_code ec = _flagMerger.merge(hdr.getFileClass(), hdr.e_flags))
+    if (auto ec = _flagMerger.mergeHeaderFlags(hdr.getFileClass(), hdr.e_flags))
       return ec;
     return BaseReaderType::loadFile(std::move(mb), registry, result);
   }