simplify code now that it is inlined.

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

diff --git a/lib/Target/ELFTargetAsmInfo.cpp b/lib/Target/ELFTargetAsmInfo.cpp
index 8ace00abd939fbfd7d2b130ebeb7bae474023032..5deabee0ba218e92271e5a1774decdebea1319de 100644 (file)
--- a/lib/Target/ELFTargetAsmInfo.cpp
+++ b/lib/Target/ELFTargetAsmInfo.cpp
@@ -61,10 +61,8 @@ ELFTargetAsmInfo::SectionKindForGlobal(const GlobalValue *GV) const {
     
     // By default - all relocations in PIC mode would force symbol to be
     // placed in r/w section.
-    unsigned Reloc = (TM.getRelocationModel() != Reloc::Static ?
-                      Reloc::LocalOrGlobal : Reloc::None);
-    
-    if (Reloc != Reloc::None && C->ContainsRelocations(Reloc))
+    if (TM.getRelocationModel() != Reloc::Static &&
+        C->ContainsRelocations(Reloc::LocalOrGlobal))
       return (C->ContainsRelocations(Reloc::Global) ?
               (isConstant ?
                SectionKind::DataRelRO : SectionKind::DataRel) :

diff --git a/lib/Target/TargetAsmInfo.cpp b/lib/Target/TargetAsmInfo.cpp
index e60855d3dd42c0e952716868c42d1f2bc8bf2491..580c3fe4db031d18ad62054c8d1d0a6099e1aafc 100644 (file)
--- a/lib/Target/TargetAsmInfo.cpp
+++ b/lib/Target/TargetAsmInfo.cpp
@@ -209,20 +209,11 @@ TargetAsmInfo::SectionKindForGlobal(const GlobalValue *GV) const {
     // note, there is no thread-local r/o section.
     Constant *C = GVar->getInitializer();
     if (C->ContainsRelocations(Reloc::LocalOrGlobal)) {
-      // Decide, whether it is still possible to put symbol into r/o section.
-      unsigned Reloc = (TM.getRelocationModel() != Reloc::Static ?
-                        Reloc::LocalOrGlobal : Reloc::None);
-
-      // We already did a query for 'all' relocs, thus - early exits.
-      if (Reloc == Reloc::LocalOrGlobal)
+      // Decide whether it is still possible to put symbol into r/o section.
+      if (TM.getRelocationModel() != Reloc::Static)
         return SectionKind::Data;
-      else if (Reloc == Reloc::None)
+      else
         return SectionKind::ROData;
-      else {
-        // Ok, target wants something funny. Honour it.
-        return (C->ContainsRelocations(Reloc) ?
-                SectionKind::Data : SectionKind::ROData);
-      }
     } else {
       // Check, if initializer is a null-terminated string
       if (isConstantString(C))