commit d73976ee078110755c82a8dfb86fe2ed226134fb
author alx32 <103613512+alx32@users.noreply.github.com> Fri Mar 01 14:12:56 2024 -0800
committer Copybara-Service <copybara-worker@google.com> Fri Mar 01 14:19:12 2024 -0800
tree b6af62d4aa900a1ccbea40583b71e878d17ada01
parent 5aa0cff7e964df5e9d3fb634706407a58ec45575

[lld][macho][NFC] Add specific namespace scope for objc symbol names (#83618)

Move symbol names from directly under `objc` scope to
`objc::symbol_names`.
Ex: `objc::klass` -> `objc::symbol_names::klass`

Co-authored-by: Alex B <alexborcan@meta.com>
GitOrigin-RevId: 7a2d9347d333afad4c78f61949b51b1363525ed9

MachO/Driver.cpp

diff --git a/MachO/Driver.cpp b/MachO/Driver.cpp
index 018ceec..9edb6b9 100644
--- a/MachO/Driver.cpp
+++ b/MachO/Driver.cpp
@@ -340,7 +340,7 @@
       }
     } else if (isCommandLineLoad && config->forceLoadObjC) {
       for (const object::Archive::Symbol &sym : file->getArchive().symbols())
-        if (sym.getName().starts_with(objc::klass))
+        if (sym.getName().starts_with(objc::symbol_names::klass))
           file->fetch(sym);
 
       // TODO: no need to look for ObjC sections for a given archive member if
@@ -395,7 +395,7 @@
     if ((isa<ObjFile>(newFile) || isa<BitcodeFile>(newFile)) && newFile->lazy &&
         config->forceLoadObjC) {
       for (Symbol *sym : newFile->symbols)
-        if (sym && sym->getName().starts_with(objc::klass)) {
+        if (sym && sym->getName().starts_with(objc::symbol_names::klass)) {
           extract(*newFile, "-ObjC");
           break;
         }

MachO/InputFiles.cpp

diff --git a/MachO/InputFiles.cpp b/MachO/InputFiles.cpp
index 158c3fb..b36d390 100644
--- a/MachO/InputFiles.cpp
+++ b/MachO/InputFiles.cpp
@@ -1921,14 +1921,14 @@
     case EncodeKind::ObjectiveCClass:
       // XXX ld64 only creates these symbols when -ObjC is passed in. We may
       // want to emulate that.
-      addSymbol(*symbol, objc::klass + symbol->getName());
-      addSymbol(*symbol, objc::metaclass + symbol->getName());
+      addSymbol(*symbol, objc::symbol_names::klass + symbol->getName());
+      addSymbol(*symbol, objc::symbol_names::metaclass + symbol->getName());
       break;
     case EncodeKind::ObjectiveCClassEHType:
-      addSymbol(*symbol, objc::ehtype + symbol->getName());
+      addSymbol(*symbol, objc::symbol_names::ehtype + symbol->getName());
       break;
     case EncodeKind::ObjectiveCInstanceVariable:
-      addSymbol(*symbol, objc::ivar + symbol->getName());
+      addSymbol(*symbol, objc::symbol_names::ivar + symbol->getName());
       break;
     }
   }

MachO/ObjC.h

diff --git a/MachO/ObjC.h b/MachO/ObjC.h
index 560c5cc..4c65f9a 100644
--- a/MachO/ObjC.h
+++ b/MachO/ObjC.h
@@ -15,10 +15,12 @@
 
 namespace objc {
 
+namespace symbol_names {
 constexpr const char klass[] = "_OBJC_CLASS_$_";
 constexpr const char metaclass[] = "_OBJC_METACLASS_$_";
 constexpr const char ehtype[] = "_OBJC_EHTYPE_$_";
 constexpr const char ivar[] = "_OBJC_IVAR_$_";
+} // namespace symbol_names
 
 // Check for duplicate method names within related categories / classes.
 void checkCategories();