2 files changed, 5 insertions, 3 deletions
diff --git a/llvm/lib/CodeGen/MIRCanonicalizerPass.cpp b/llvm/lib/CodeGen/MIRCanonicalizerPass.cpp
index 8f02423d88a..af6fc117c89 100644
--- a/llvm/lib/CodeGen/MIRCanonicalizerPass.cpp
+++ b/llvm/lib/CodeGen/MIRCanonicalizerPass.cpp
@@ -318,7 +318,7 @@ static bool rescheduleCanonically(unsigned &PseudoIdempotentInstCount,
   return Changed;
 }
 
-bool propagateLocalCopies(MachineBasicBlock *MBB) {
+static bool propagateLocalCopies(MachineBasicBlock *MBB) {
   bool Changed = false;
   MachineRegisterInfo &MRI = MBB->getParent()->getRegInfo();
 
@@ -468,9 +468,8 @@ static void doCandidateWalk(std::vector<TypedVReg> &VRegs,
   }
 }
 
+namespace {
 class NamedVRegCursor {
-
-private:
   MachineRegisterInfo &MRI;
   unsigned virtualVRegNumber;
 
@@ -512,6 +511,7 @@ public:
     return MRI.createVirtualRegister(RC, OS.str());
   }
 };
+} // namespace
 
 static std::map<unsigned, unsigned>
 GetVRegRenameMap(const std::vector<TypedVReg> &VRegs,
diff --git a/llvm/lib/ObjectYAML/DWARFEmitter.cpp b/llvm/lib/ObjectYAML/DWARFEmitter.cpp
index 6d75897066a..f23fa123760 100644
--- a/llvm/lib/ObjectYAML/DWARFEmitter.cpp
+++ b/llvm/lib/ObjectYAML/DWARFEmitter.cpp
@@ -307,6 +307,7 @@ EmitDebugSectionImpl(const DWARFYAML::Data &DI, EmitFuncType EmitFunc,
     OutputBuffers[Sec] = MemoryBuffer::getMemBufferCopy(Data);
 }
 
+namespace {
 class DIEFixupVisitor : public DWARFYAML::Visitor {
   uint64_t Length;
 
@@ -345,6 +346,7 @@ private:
     Length += MBR.getBufferSize();
   }
 };
+} // namespace
 
 Expected<StringMap<std::unique_ptr<MemoryBuffer>>>
 DWARFYAML::EmitDebugSections(StringRef YAMLString, bool ApplyFixups,