From 273ba73689f4f47b195708be2c2107a30cef6e77 Mon Sep 17 00:00:00 2001
From: Alexander Shaposhnikov <alexshap@fb.com>
Date: Sat, 7 Nov 2020 19:58:19 -0800
Subject: [PATCH] [llvm-objcopy][MachO] Minor refactoring of MachOLayoutBuilder

Move the implementation of getStringTableBuilderKind into
MachOLayoutBuilder.cpp. NFC.

Test plan: make check-all
---
 llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp | 8 ++++++++
 llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.h   | 7 +------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp b/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
index ea01e85..8e2bf362 100644
--- a/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
+++ b/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.cpp
@@ -15,6 +15,14 @@ namespace llvm {
 namespace objcopy {
 namespace macho {
 
+StringTableBuilder::Kind
+MachOLayoutBuilder::getStringTableBuilderKind(const Object &O, bool Is64Bit) {
+  if (O.Header.FileType == MachO::HeaderFileType::MH_OBJECT)
+    return Is64Bit ? StringTableBuilder::MachO64 : StringTableBuilder::MachO;
+  return Is64Bit ? StringTableBuilder::MachO64Linked
+                 : StringTableBuilder::MachOLinked;
+}
+
 uint32_t MachOLayoutBuilder::computeSizeOfCmds() const {
   uint32_t Size = 0;
   for (const LoadCommand &LC : O.LoadCommands) {
diff --git a/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.h b/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.h
index a0ed02e..5fe6683 100644
--- a/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.h
+++ b/llvm/tools/llvm-objcopy/MachO/MachOLayoutBuilder.h
@@ -34,12 +34,7 @@ class MachOLayoutBuilder {
   Error layoutTail(uint64_t Offset);
 
   static StringTableBuilder::Kind getStringTableBuilderKind(const Object &O,
-                                                            bool Is64Bit) {
-    if (O.Header.FileType == MachO::HeaderFileType::MH_OBJECT)
-      return Is64Bit ? StringTableBuilder::MachO64 : StringTableBuilder::MachO;
-    return Is64Bit ? StringTableBuilder::MachO64Linked
-                   : StringTableBuilder::MachOLinked;
-  }
+                                                            bool Is64Bit);
 
 public:
   MachOLayoutBuilder(Object &O, bool Is64Bit, uint64_t PageSize)
-- 
2.7.4