commit 81466bc9eb8b330d47b75b4ef957387b28eaae72
author Chris Lattner <sabre@nondot.org> Wed Jul 22 00:47:11 2009 +0000
committer Chris Lattner <sabre@nondot.org> Wed Jul 22 00:47:11 2009 +0000
tree 3277735e8baa031badb31dfc3e6af7d8f97087ac
parent ef5833c140de096c6b9334025a45dca94cba9fc3

inline the two MergeableConstSection implementations into their
only caller.



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

lib/Target/DarwinTargetAsmInfo.cpp

diff --git a/lib/Target/DarwinTargetAsmInfo.cpp b/lib/Target/DarwinTargetAsmInfo.cpp
index ad9dd68..bc2189e 100644
--- a/lib/Target/DarwinTargetAsmInfo.cpp
+++ b/lib/Target/DarwinTargetAsmInfo.cpp
@@ -131,31 +131,33 @@
   bool isNonStatic = TM.getRelocationModel() != Reloc::Static;
 
   switch (Kind) {
-   case SectionKind::Text:
+  case SectionKind::Text:
     if (isWeak)
       return TextCoalSection;
     else
       return TextSection;
-   case SectionKind::Data:
-   case SectionKind::ThreadData:
-   case SectionKind::BSS:
-   case SectionKind::ThreadBSS:
+  case SectionKind::Data:
+  case SectionKind::ThreadData:
+  case SectionKind::BSS:
+  case SectionKind::ThreadBSS:
     if (cast<GlobalVariable>(GV)->isConstant())
       return (isWeak ? ConstDataCoalSection : ConstDataSection);
     else
       return (isWeak ? DataCoalSection : DataSection);
-   case SectionKind::ROData:
+  case SectionKind::ROData:
     return (isWeak ? ConstDataCoalSection :
             (isNonStatic ? ConstDataSection : getReadOnlySection()));
-   case SectionKind::RODataMergeStr:
+  case SectionKind::RODataMergeStr:
     return (isWeak ?
             ConstTextCoalSection :
             MergeableStringSection(cast<GlobalVariable>(GV)));
-   case SectionKind::RODataMergeConst:
+  case SectionKind::RODataMergeConst: {
     if (isWeak) return ConstDataCoalSection;
-    return MergeableConstSection(cast<GlobalVariable>(GV)
-                                 ->getInitializer()->getType());
-   default:
+    const Type *Ty = cast<GlobalVariable>(GV)->getInitializer()->getType();
+    const TargetData *TD = TM.getTargetData();
+    return getSectionForMergableConstant(TD->getTypeAllocSize(Ty), 0);
+  }
+  default:
     llvm_unreachable("Unsuported section kind for global");
   }
 
@@ -179,12 +181,6 @@
   return getReadOnlySection();
 }
 
-const Section*
-DarwinTargetAsmInfo::MergeableConstSection(const Type *Ty) const {
-  const TargetData *TD = TM.getTargetData();
-  return getSectionForMergableConstant(TD->getTypeAllocSize(Ty), 0);
-}
-
 const Section *
 DarwinTargetAsmInfo::getSectionForMergableConstant(uint64_t Size,
                                                    unsigned ReloInfo) const {