3 files changed, 5 insertions, 3 deletions
diff --git a/llvm/include/llvm/CodeGen/MachineOutliner.h b/llvm/include/llvm/CodeGen/MachineOutliner.h
index 573c1f5b825..6b7efe2ec6c 100644
--- a/llvm/include/llvm/CodeGen/MachineOutliner.h
+++ b/llvm/include/llvm/CodeGen/MachineOutliner.h
@@ -18,10 +18,9 @@
 
 #include "llvm/CodeGen/MachineFunction.h"
 
+namespace llvm {
 namespace outliner {
 
-using namespace llvm;
-
 /// Represents how an instruction should be mapped by the outliner.
 /// \p Legal instructions are those which are safe to outline.
 /// \p LegalTerminator instructions are safe to outline, but only as the
@@ -190,5 +189,6 @@ public:
         TCI(TCI) {}
 };
 } // namespace outliner
+} // namespace llvm
 
 #endif
diff --git a/llvm/lib/Analysis/TargetTransformInfo.cpp b/llvm/lib/Analysis/TargetTransformInfo.cpp
index 69da0de200b..fea6db458c7 100644
--- a/llvm/lib/Analysis/TargetTransformInfo.cpp
+++ b/llvm/lib/Analysis/TargetTransformInfo.cpp
@@ -771,7 +771,7 @@ static bool isTransposeVectorMask(ArrayRef<int> Mask) {
   return true;
 }
 
-TargetTransformInfo::OperandValueKind
+static TargetTransformInfo::OperandValueKind
 getOperandInfo(Value *V, TargetTransformInfo::OperandValueProperties &OpProps) {
   TargetTransformInfo::OperandValueKind OpInfo =
       TargetTransformInfo::OK_AnyValue;
diff --git a/llvm/lib/Support/Unix/Signals.inc b/llvm/lib/Support/Unix/Signals.inc
index f4e99266459..de26695d64e 100644
--- a/llvm/lib/Support/Unix/Signals.inc
+++ b/llvm/lib/Support/Unix/Signals.inc
@@ -86,6 +86,7 @@ using InterruptFunctionType = void (*)();
 static std::atomic<InterruptFunctionType> InterruptFunction =
     ATOMIC_VAR_INIT(nullptr);
 
+namespace {
 /// Signal-safe removal of files.
 /// Inserting and erasing from the list isn't signal-safe, but removal of files
 /// themselves is signal-safe. Memory is freed when the head is freed, deletion
@@ -194,6 +195,7 @@ struct FilesToRemoveCleanup {
       delete Head;
   }
 };
+} // namespace
 
 static StringRef Argv0;