make GlobalStrings an array

Author: ellishg

lib/IRGen/GenDecl.cpp

@@ -1065,7 +1065,7 @@ void IRGenModule::SetCStringLiteralSection(llvm::GlobalVariable *GV,
       GV->setSection(IRGenModule::ObjCMethodTypeSectionName);
       return;
     case ObjCLabelType::PropertyName:
-      GV->setSection(IRGenModule::ObjCPropertyNameSectionName);
+      GV->setSection(IRGenModule::ObjCMethodNameSectionName);
       return;
     }
   case llvm::Triple::ELF:
@@ -6043,16 +6043,15 @@ IRGenModule::getAddrOfGlobalString(StringRef data, CStringSectionType type,
   case CStringSectionType::ObjCMethodType:
     sectionName = ObjCMethodTypeSectionName;
     break;
-  case CStringSectionType::ObjCPropertyName:
-    sectionName = ObjCPropertyNameSectionName;
-    break;
   case CStringSectionType::OSLogString:
     sectionName = OSLogStringSectionName;
     break;
+  case CStringSectionType::NumTypes:
+    llvm_unreachable("invalid type");
   }
 
   // Check whether this string already exists.
-  auto &entry = GlobalStrings[sectionName][data];
+  auto &entry = GlobalStrings[static_cast<size_t>(type)][data];
 
   if (entry.second) {
     // FIXME: Clear unnamed_addr if the global will be relative referenced

lib/IRGen/IRGenModule.h

@@ -674,8 +674,11 @@ enum class CStringSectionType {
   ObjCClassName,
   ObjCMethodName,
   ObjCMethodType,
-  ObjCPropertyName,
   OSLogString,
+  // Place all new section types above this line
+  NumTypes,
+  // Place all alias below this line
+  ObjCPropertyName = ObjCMethodName,
 };
 
 /// IRGenModule - Primary class for emitting IR for global declarations.
@@ -1340,8 +1343,9 @@ class IRGenModule {
   llvm::DenseMap<LinkEntity, llvm::Function*> GlobalFuncs;
   llvm::DenseSet<const clang::Decl *> GlobalClangDecls;
   // Maps sectionName -> string data -> constant
-  llvm::StringMap<
-      llvm::StringMap<std::pair<llvm::GlobalVariable *, llvm::Constant *>>>
+  std::array<
+      llvm::StringMap<std::pair<llvm::GlobalVariable *, llvm::Constant *>>,
+      static_cast<size_t>(CStringSectionType::NumTypes)>
       GlobalStrings;
   llvm::StringMap<llvm::Constant*> GlobalUTF16Strings;
   llvm::StringMap<std::pair<llvm::GlobalVariable*, llvm::Constant*>>
@@ -1559,8 +1563,6 @@ class IRGenModule {
       "__TEXT,__objc_methname,cstring_literals";
   static constexpr const char ObjCMethodTypeSectionName[] =
       "__TEXT,__objc_methtype,cstring_literals";
-  static constexpr const char ObjCPropertyNameSectionName[] =
-      "__TEXT,__objc_methname,cstring_literals";
   static constexpr const char OSLogStringSectionName[] =
       "__TEXT,__oslogstring,cstring_literals";