[MachO] Move trivial accessors to header.

Requested by: Jim Grosbach.

llvm-svn: 245963

2 files changed, 18 insertions, 24 deletions

diff --git a/llvm/include/llvm/Object/MachO.h b/llvm/include/llvm/Object/MachO.h
index 903398321a9..75259bc48f8 100644
--- a/llvm/include/llvm/Object/MachO.h
+++ b/llvm/include/llvm/Object/MachO.h
@@ -344,12 +344,6 @@ public:
   getLinkerOptionLoadCommand(const LoadCommandInfo &L) const;
   MachO::version_min_command
   getVersionMinLoadCommand(const LoadCommandInfo &L) const;
-  static uint32_t
-  getVersionMinMajor(MachO::version_min_command &C, bool SDK);
-  static uint32_t
-  getVersionMinMinor(MachO::version_min_command &C, bool SDK);
-  static uint32_t
-  getVersionMinUpdate(MachO::version_min_command &C, bool SDK);
   MachO::dylib_command
   getDylibIDLoadCommand(const LoadCommandInfo &L) const;
   MachO::dyld_info_command
@@ -428,6 +422,24 @@ public:
     return v->isMachO();
   }
 
+  static uint32_t
+  getVersionMinMajor(MachO::version_min_command &C, bool SDK) {
+    uint32_t VersionOrSDK = (SDK) ? C.sdk : C.version;
+    return (VersionOrSDK >> 16) & 0xffff;
+  }
+
+  static uint32_t
+  getVersionMinMinor(MachO::version_min_command &C, bool SDK) {
+    uint32_t VersionOrSDK = (SDK) ? C.sdk : C.version;
+    return (VersionOrSDK >> 8) & 0xff;
+  }
+
+  static uint32_t
+  getVersionMinUpdate(MachO::version_min_command &C, bool SDK) {
+    uint32_t VersionOrSDK = (SDK) ? C.sdk : C.version;
+    return VersionOrSDK & 0xff;
+  }
+
 private:
   uint64_t getSymbolValueImpl(DataRefImpl Symb) const override;
 
diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp
index d287eec6c2c..d1faf7be3af 100644
--- a/llvm/lib/Object/MachOObjectFile.cpp
+++ b/llvm/lib/Object/MachOObjectFile.cpp
@@ -2001,24 +2001,6 @@ MachOObjectFile::getVersionMinLoadCommand(const LoadCommandInfo &L) const {
   return getStruct<MachO::version_min_command>(this, L.Ptr);
 }
 
-uint32_t
-MachOObjectFile::getVersionMinMajor(MachO::version_min_command &C, bool SDK) {
-  uint32_t VersionOrSDK = (SDK) ? C.sdk : C.version;
-  return (VersionOrSDK >> 16) & 0xffff;
-}
-
-uint32_t
-MachOObjectFile::getVersionMinMinor(MachO::version_min_command &C, bool SDK) {
-  uint32_t VersionOrSDK = (SDK) ? C.sdk : C.version;
-  return (VersionOrSDK >> 8) & 0xff;
-}
-
-uint32_t
-MachOObjectFile::getVersionMinUpdate(MachO::version_min_command &C, bool SDK) {
-  uint32_t VersionOrSDK = (SDK) ? C.sdk : C.version;
-  return VersionOrSDK & 0xff;
-}
-
 MachO::dylib_command
 MachOObjectFile::getDylibIDLoadCommand(const LoadCommandInfo &L) const {
   return getStruct<MachO::dylib_command>(this, L.Ptr);