From: Eric Christopher <echristo@gmail.com>
Date: Mon, 4 Aug 2014 21:25:44 +0000 (+0000)
Subject: Reorder to keep data and routines separate and to keep a couple of
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f11f5f979f15b10034e22c0aad7542c600e58f7;p=platform%2Fupstream%2Fllvm.git

Reorder to keep data and routines separate and to keep a couple of
similar routines close to each other.

llvm-svn: 214782
---

diff --git a/llvm/include/llvm/Target/TargetMachine.h b/llvm/include/llvm/Target/TargetMachine.h
index d3f3e58..dcd454e 100644
--- a/llvm/include/llvm/Target/TargetMachine.h
+++ b/llvm/include/llvm/Target/TargetMachine.h
@@ -86,6 +86,8 @@ protected: // Can only create subclasses.
   unsigned RequireStructuredCFG : 1;
 
 public:
+  mutable TargetOptions Options;
+
   virtual ~TargetMachine();
 
   const Target &getTarget() const { return TheTarget; }
@@ -104,7 +106,12 @@ public:
     return const_cast<TargetSubtargetInfo *>(TM->getSubtargetImpl());
   }
 
-  mutable TargetOptions Options;
+  /// getSubtarget - This method returns a pointer to the specified type of
+  /// TargetSubtargetInfo.  In debug builds, it verifies that the object being
+  /// returned is of the correct type.
+  template<typename STC> const STC &getSubtarget() const {
+    return *static_cast<const STC*>(getSubtargetImpl());
+  }
 
   /// \brief Reset the target options based on the function's attributes.
   void resetTargetOptions(const MachineFunction *MF) const;
@@ -113,13 +120,6 @@ public:
   ///
   const MCAsmInfo *getMCAsmInfo() const { return AsmInfo; }
 
-  /// getSubtarget - This method returns a pointer to the specified type of
-  /// TargetSubtargetInfo.  In debug builds, it verifies that the object being
-  /// returned is of the correct type.
-  template<typename STC> const STC &getSubtarget() const {
-    return *static_cast<const STC*>(getSubtargetImpl());
-  }
-
   /// getIntrinsicInfo - If intrinsic information is available, return it.  If
   /// not, return null.
   ///