Change code as recommended by MaskRay

Author: redstar

llvm/include/llvm/MC/MCContext.h

@@ -364,6 +364,10 @@ class MCContext {
   MCSymbolXCOFF *createXCOFFSymbolImpl(const MCSymbolTableEntry *Name,
                                        bool IsTemporary);
 
+  template <typename TAttr>
+  MCSectionGOFF *getGOFFSection(SectionKind Kind, StringRef Name,
+                                TAttr SDAttributes, MCSection *Parent);
+
   /// Map of currently defined macros.
   StringMap<MCAsmMacro> MacroMap;
 
@@ -600,12 +604,6 @@ class MCContext {
                                                    unsigned Flags,
                                                    unsigned EntrySize);
 
-private:
-  template <typename TAttr>
-  MCSectionGOFF *getGOFFSection(SectionKind Kind, StringRef Name,
-                                TAttr SDAttributes, MCSection *Parent);
-
-public:
   MCSectionGOFF *getGOFFSection(SectionKind Kind, StringRef Name,
                                 GOFF::SDAttr SDAttributes);
   MCSectionGOFF *getGOFFSection(SectionKind Kind, StringRef Name,

llvm/lib/MC/MCGOFFStreamer.cpp

@@ -27,16 +27,14 @@ GOFFObjectWriter &MCGOFFStreamer::getWriter() {
   return static_cast<GOFFObjectWriter &>(getAssembler().getWriter());
 }
 
-namespace {
 // Make sure that all section are registered in the correct order.
-void registerSectionHierarchy(MCAssembler &Asm, MCSectionGOFF *Section) {
+static void registerSectionHierarchy(MCAssembler &Asm, MCSectionGOFF *Section) {
   if (Section->isRegistered())
     return;
   if (Section->getParent())
     registerSectionHierarchy(Asm, Section->getParent());
   Asm.registerSection(*Section);
 }
-} // namespace
 
 void MCGOFFStreamer::changeSection(MCSection *Section, uint32_t Subsection) {
   registerSectionHierarchy(getAssembler(),

llvm/lib/MC/MCSectionGOFF.cpp

@@ -12,12 +12,11 @@
 
 using namespace llvm;
 
-namespace {
-void emitCATTR(raw_ostream &OS, StringRef Name, GOFF::ESDRmode Rmode,
-               GOFF::ESDAlignment Alignment,
-               GOFF::ESDLoadingBehavior LoadBehavior,
-               GOFF::ESDExecutable Executable, bool IsReadOnly,
-               uint32_t SortKey, StringRef PartName) {
+static void emitCATTR(raw_ostream &OS, StringRef Name, GOFF::ESDRmode Rmode,
+                      GOFF::ESDAlignment Alignment,
+                      GOFF::ESDLoadingBehavior LoadBehavior,
+                      GOFF::ESDExecutable Executable, bool IsReadOnly,
+                      uint32_t SortKey, StringRef PartName) {
   OS << Name << " CATTR ";
   OS << "ALIGN(" << static_cast<unsigned>(Alignment) << ")";
   switch (LoadBehavior) {
@@ -67,9 +66,10 @@ void emitCATTR(raw_ostream &OS, StringRef Name, GOFF::ESDRmode Rmode,
   OS << '\n';
 }
 
-void emitXATTR(raw_ostream &OS, StringRef Name, GOFF::ESDLinkageType Linkage,
-               GOFF::ESDExecutable Executable,
-               GOFF::ESDBindingScope BindingScope) {
+static void emitXATTR(raw_ostream &OS, StringRef Name,
+                      GOFF::ESDLinkageType Linkage,
+                      GOFF::ESDExecutable Executable,
+                      GOFF::ESDBindingScope BindingScope) {
   OS << Name << " XATTR ";
   OS << "LINKAGE(" << (Linkage == GOFF::ESD_LT_OS ? "OS" : "XPLINK") << "),";
   if (Executable != GOFF::ESD_EXE_Unspecified)
@@ -97,7 +97,6 @@ void emitXATTR(raw_ostream &OS, StringRef Name, GOFF::ESDLinkageType Linkage,
   }
   OS << '\n';
 }
-} // namespace
 
 void MCSectionGOFF::printSwitchToSection(const MCAsmInfo &MAI, const Triple &T,
                                          raw_ostream &OS,