From: Davide Italiano <davide@freebsd.org>
Date: Tue, 25 Aug 2015 18:27:59 +0000 (+0000)
Subject: [MachO] Move trivial accessors to header.
X-Git-Tag: android-x86-7.1-r4~44239
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=37b18da3e3dafbd003ceff5cd932e95be4e2cbc6;p=android-x86%2Fexternal-llvm.git

[MachO] Move trivial accessors to header.

Requested by: Jim Grosbach.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@245963 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/Object/MachO.h b/include/llvm/Object/MachO.h
index 903398321a9..75259bc48f8 100644
--- a/include/llvm/Object/MachO.h
+++ b/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/lib/Object/MachOObjectFile.cpp b/lib/Object/MachOObjectFile.cpp
index d287eec6c2c..d1faf7be3af 100644
--- a/lib/Object/MachOObjectFile.cpp
+++ b/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);