simplify getSectionForMergableConstant to take a SectionKind.

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

3 files changed, 10 insertions, 31 deletions

diff --git a/lib/Target/DarwinTargetAsmInfo.cpp b/lib/Target/DarwinTargetAsmInfo.cpp
index 1804adf..778aa22 100644
--- a/lib/Target/DarwinTargetAsmInfo.cpp
+++ b/lib/Target/DarwinTargetAsmInfo.cpp
@@ -188,25 +188,18 @@ DarwinTargetAsmInfo::MergeableStringSection(const GlobalVariable *GV) const {
 }
 
 const Section *
-DarwinTargetAsmInfo::getSectionForMergableConstant(uint64_t Size,
-                                                   unsigned ReloInfo) const {
+DarwinTargetAsmInfo::getSectionForMergableConstant(SectionKind Kind) const {
   // If this constant requires a relocation, we have to put it in the data
   // segment, not in the text segment.
-  if (ReloInfo != 0)
+  if (Kind.isDataRel())
     return ConstDataSection;
   
-  switch (Size) {
-  default: break;
-  case 4:
+  if (Kind.isMergableConst4())
     return FourByteConstantSection;
-  case 8:
+  if (Kind.isMergableConst8())
     return EightByteConstantSection;
-  case 16:
-    if (SixteenByteConstantSection)
-      return SixteenByteConstantSection;
-    break;
-  }
-  
+  if (Kind.isMergableConst16() && SixteenByteConstantSection)
+    return SixteenByteConstantSection;
   return ReadOnlySection;  // .const
 }
 
diff --git a/lib/Target/ELFTargetAsmInfo.cpp b/lib/Target/ELFTargetAsmInfo.cpp
index 82c993b..5d8d720 100644
--- a/lib/Target/ELFTargetAsmInfo.cpp
+++ b/lib/Target/ELFTargetAsmInfo.cpp
@@ -92,21 +92,8 @@ ELFTargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV,
 /// specified size and relocation information, return a section that it
 /// should be placed in.
 const Section *
-ELFTargetAsmInfo::getSectionForMergableConstant(uint64_t Size,
-                                                unsigned ReloInfo) const {
-  // If this constant pool entry has relocations, stick it into a relocatable
-  // section.
-  if (ReloInfo == 2)
-    return DataRelROSection;
-  if (ReloInfo == 1)
-    return DataRelROLocalSection;
-  
-  switch (Size) {
-  default: return ReadOnlySection;   // .rodata
-  case 4:  return MergableConst4Section;
-  case 8:  return MergableConst8Section;
-  case 16: return MergableConst16Section;
-  }
+ELFTargetAsmInfo::getSectionForMergableConstant(SectionKind Kind) const {
+  return SelectSectionForGlobal(0, Kind);
 }
 
 /// getFlagsForNamedSection - If this target wants to be able to infer
diff --git a/lib/Target/TargetAsmInfo.cpp b/lib/Target/TargetAsmInfo.cpp
index c68f04b..7abfcf9 100644
--- a/lib/Target/TargetAsmInfo.cpp
+++ b/lib/Target/TargetAsmInfo.cpp
@@ -372,9 +372,8 @@ TargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV,
 /// specified size and relocation information, return a section that it
 /// should be placed in.
 const Section *
-TargetAsmInfo::getSectionForMergableConstant(uint64_t Size,
-                                             unsigned ReloInfo) const {
-  if (ReloInfo == 0)
+TargetAsmInfo::getSectionForMergableConstant(SectionKind Kind) const {
+  if (Kind.isReadOnly())
     if (const Section *S = getReadOnlySection())
       return S;