Merge commit '0c454df448c1' from llvm.org/main into next

Author: git apple-llvm automerger

llvm/include/llvm/MC/MCStreamer.h

@@ -258,6 +258,10 @@ class MCStreamer {
   /// Generate debug info that is Cas Friendly
   bool GenerateCasFriendlyDebugInfo = false;
 
+  /// This is called by popSection and switchSection, if the current
+  /// section changes.
+  virtual void changeSection(MCSection *, uint32_t);
+
 protected:
   MCFragment *CurFrag = nullptr;
 
@@ -420,12 +424,6 @@ class MCStreamer {
     return SymbolOrdering.lookup(Sym);
   }
 
-  /// Update streamer for a new active section.
-  ///
-  /// This is called by popSection and switchSection, if the current
-  /// section changes.
-  virtual void changeSection(MCSection *, uint32_t);
-
   /// Save the current and previous section on the section stack.
   void pushSection() {
     SectionStack.push_back(

llvm/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp

@@ -894,11 +894,11 @@ void MipsTargetELFStreamer::finish() {
 
   // .bss, .text and .data are always at least 16-byte aligned.
   MCSection &TextSection = *OFI.getTextSection();
-  S.changeSection(&TextSection);
+  S.switchSection(&TextSection);
   MCSection &DataSection = *OFI.getDataSection();
-  S.changeSection(&DataSection);
+  S.switchSection(&DataSection);
   MCSection &BSSSection = *OFI.getBSSSection();
-  S.changeSection(&BSSSection);
+  S.switchSection(&BSSSection);
 
   TextSection.ensureMinAlignment(Align(16));
   DataSection.ensureMinAlignment(Align(16));