use helper function

Author: ellishg

lib/IRGen/GenConstant.cpp

@@ -79,8 +79,7 @@ llvm::Constant *irgen::emitAddrOfConstantString(IRGenModule &IGM,
   case StringLiteralInst::Encoding::Bytes:
   case StringLiteralInst::Encoding::UTF8:
   case StringLiteralInst::Encoding::UTF8_OSLOG:
-    return IGM.getAddrOfGlobalString(SLI->getValue(), /*sectionName=*/"", false,
-                                     useOSLogEncoding);
+    return IGM.getAddrOfGlobalString(SLI->getValue(), false, useOSLogEncoding);
 
   case StringLiteralInst::Encoding::ObjCSelector:
     llvm_unreachable("cannot get the address of an Objective-C selector");

lib/IRGen/GenDecl.cpp

@@ -4240,10 +4240,10 @@ static TypeEntityReference
 getObjCClassByNameReference(IRGenModule &IGM, ClassDecl *cls) {
   auto kind = TypeReferenceKind::DirectObjCClassName;
   SmallString<64> objcRuntimeNameBuffer;
-  auto ref =
-      IGM.getAddrOfGlobalString(cls->getObjCRuntimeName(objcRuntimeNameBuffer),
-                                IRGenModule::ObjCClassNameSectionName,
-                                /*willBeRelativelyAddressed=*/true);
+  auto ref = IGM.getAddrOfGlobalString(
+      cls->getObjCRuntimeName(objcRuntimeNameBuffer),
+      /*willBeRelativelyAddressed=*/true,
+      /*useOSLogSection=*/false, IRGenModule::ObjCClassNameSectionName);
 
   return TypeEntityReference(kind, ref);
 }
@@ -4801,7 +4801,7 @@ void IRGenModule::emitAccessibleFunction(StringRef sectionName,
   // -- Field: Name (record name)
   {
     llvm::Constant *name =
-        getAddrOfGlobalString(func.getFunctionName(), /*sectionName=*/"",
+        getAddrOfGlobalString(func.getFunctionName(),
                               /*willBeRelativelyAddressed=*/true);
     fields.addRelativeAddress(name);
   }
@@ -6016,6 +6016,12 @@ Address IRGenFunction::createAlloca(llvm::Type *type,
   return Address(alloca, type, alignment);
 }
 
+llvm::Constant *IRGenModule::getAddrOfGlobalString(StringRef data,
+                                                   const char *sectionName) {
+  return getAddrOfGlobalString(data, /*willBeRelativelyAddressed=*/false,
+                               /*useOSLogSection=*/false, sectionName);
+}
+
 /// Get or create a global string constant.
 ///
 /// \returns an i8* with a null terminator; note that embedded nulls
@@ -6024,10 +6030,9 @@ Address IRGenFunction::createAlloca(llvm::Type *type,
 /// FIXME: willBeRelativelyAddressed is only needed to work around an ld64 bug
 /// resolving relative references to coalesceable symbols.
 /// It should be removed when fixed. rdar://problem/22674524
-llvm::Constant *
-IRGenModule::getAddrOfGlobalString(StringRef data, StringRef sectionName,
-                                   bool willBeRelativelyAddressed,
-                                   bool useOSLogSection) {
+llvm::Constant *IRGenModule::getAddrOfGlobalString(
+    StringRef data, bool willBeRelativelyAddressed, bool useOSLogSection,
+    StringRef sectionName) {
   useOSLogSection = useOSLogSection &&
     TargetInfo.OutputObjectFormat == llvm::Triple::MachO;
 
@@ -6069,11 +6074,9 @@ IRGenModule::getAddrOfGlobalIdentifierString(StringRef data,
   if (Lexer::identifierMustAlwaysBeEscaped(data)) {
     llvm::SmallString<256> name;
     Mangle::Mangler::appendRawIdentifierForRuntime(data, name);
-    return getAddrOfGlobalString(name, /*sectionName=*/"",
-                                 willBeRelativelyAddressed);
+    return getAddrOfGlobalString(name, willBeRelativelyAddressed);
   }
-  return getAddrOfGlobalString(data, /*sectionName=*/"",
-                               willBeRelativelyAddressed);
+  return getAddrOfGlobalString(data, willBeRelativelyAddressed);
 }
 
 /// Get or create a global UTF-16 string constant.

lib/IRGen/GenKeyPath.cpp

@@ -1143,7 +1143,6 @@ IRGenModule::getAddrOfKeyPathPattern(KeyPathPattern *pattern,
   // null otherwise.
   if (!pattern->getObjCString().empty()) {
     auto objcString = getAddrOfGlobalString(pattern->getObjCString(),
-                                            /*sectionName=*/"",
                                             /*relatively addressed*/ true);
     fields.addRelativeAddress(objcString);
   } else {

lib/IRGen/GenMeta.cpp

@@ -845,9 +845,8 @@ namespace {
       IRGenMangler mangler(IGM.Context);
       auto mangledName = mangler.mangleAnonymousDescriptorName(Name);
       auto mangledNameConstant =
-          IGM.getAddrOfGlobalString(mangledName,
-                                    /*sectionName=*/"",
-                                    /*willBeRelativelyAddressed*/ true);
+        IGM.getAddrOfGlobalString(mangledName,
+                                  /*willBeRelativelyAddressed*/ true);
       B.addRelativeAddress(mangledNameConstant);
     }
 
@@ -1278,7 +1277,6 @@ namespace {
       llvm::Constant *global = nullptr;
       if (!AssociatedTypeNames.empty()) {
         global = IGM.getAddrOfGlobalString(AssociatedTypeNames,
-                                           /*sectionName=*/"",
                                            /*willBeRelativelyAddressed=*/true);
       }
       B.addRelativeAddressOrNull(global);
@@ -1517,11 +1515,9 @@ namespace {
         name.pop_back();
         assert(name.back() == '\0');
       }
-
-      auto nameStr =
-          IGM.getAddrOfGlobalString(name,
-                                    /*sectionName=*/"",
-                                    /*willBeRelativelyAddressed*/ true);
+      
+      auto nameStr = IGM.getAddrOfGlobalString(name,
+                                               /*willBeRelativelyAddressed*/ true);
       B.addRelativeAddress(nameStr);
     }
 

lib/IRGen/GenObjC.cpp

@@ -1330,7 +1330,7 @@ getObjectEncodingFromClangNode(IRGenModule &IGM, Decl *d,
     auto clangDecl = d->getClangNode().castAsDecl();
     auto &clangASTContext = IGM.getClangASTContext();
     std::string typeStr;
-    std::string sectionName;
+    const char *sectionName;
     if (auto objcMethodDecl = dyn_cast<clang::ObjCMethodDecl>(clangDecl)) {
       typeStr = clangASTContext.getObjCEncodingForMethodDecl(
           objcMethodDecl, useExtendedEncoding /*extended*/);

lib/IRGen/IRGenModule.h

@@ -1204,9 +1204,11 @@ class IRGenModule {
       StringRef Str, bool willBeRelativelyAddressed = false,
       StringRef sectionName = "", StringRef name = "");
   llvm::Constant *getAddrOfGlobalString(StringRef utf8,
-                                        StringRef sectionName = "",
                                         bool willBeRelativelyAddressed = false,
-                                        bool useOSLogSection = false);
+                                        bool useOSLogSection = false,
+                                        StringRef sectionName = "");
+  llvm::Constant *getAddrOfGlobalString(StringRef utf8,
+                                        const char *sectionName);
   llvm::Constant *getAddrOfGlobalUTF16String(StringRef utf8);
   llvm::Constant *
   getAddrOfGlobalIdentifierString(StringRef utf8,