9 files changed, 34 insertions, 56 deletions
diff --git a/llvm/unittests/ADT/SCCIteratorTest.cpp b/llvm/unittests/ADT/SCCIteratorTest.cpp
index 95639940160..da8c04483f9 100644
--- a/llvm/unittests/ADT/SCCIteratorTest.cpp
+++ b/llvm/unittests/ADT/SCCIteratorTest.cpp
@@ -10,10 +10,7 @@
 #include "llvm/ADT/SCCIterator.h"
 #include "llvm/ADT/GraphTraits.h"
 #include "gtest/gtest.h"
-#include <cassert>
-#include <climits>
-#include <utility>
-#include <vector>
+#include <limits.h>
 
 using namespace llvm;
 
@@ -30,14 +27,13 @@ private:
   static void ValidateIndex(unsigned Idx) {
     assert(Idx < N && "Invalid node index!");
   }
-
 public:
+
   /// NodeSubset - A subset of the graph's nodes.
   class NodeSubset {
     typedef unsigned char BitVector; // Where the limitation N <= 8 comes from.
     BitVector Elements;
     NodeSubset(BitVector e) : Elements(e) {}
-
   public:
     /// NodeSubset - Default constructor, creates an empty subset.
     NodeSubset() : Elements(0) {
@@ -102,8 +98,8 @@ public:
 private:
   /// Nodes - The list of nodes for this graph.
   NodeType Nodes[N];
-
 public:
+
   /// Graph - Default constructor.  Creates an empty graph.
   Graph() {
     // Let each node know which node it is.  This allows us to find the start of
@@ -170,7 +166,6 @@ public:
     NodeSubset Children;
 
     ChildIterator(); // Disable default constructor.
-
   protected:
     ChildIterator(NodeType *F, NodeSubset C) : FirstNode(F), Children(C) {}
 
@@ -346,4 +341,4 @@ TEST(SCCIteratorTest, AllSmallGraphs) {
   }
 }
 
-} // end namespace llvm
+}
diff --git a/llvm/unittests/ADT/SmallStringTest.cpp b/llvm/unittests/ADT/SmallStringTest.cpp
index b04437873e6..995ef8e8127 100644
--- a/llvm/unittests/ADT/SmallStringTest.cpp
+++ b/llvm/unittests/ADT/SmallStringTest.cpp
@@ -12,9 +12,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringRef.h"
 #include "gtest/gtest.h"
+#include <climits>
+#include <cstring>
+#include <stdarg.h>
 
 using namespace llvm;
 
@@ -203,4 +204,4 @@ TEST(StringRefTest, Comparisons) {
   EXPECT_EQ( 1, SmallString<10>("V8_q0").compare_numeric("V1_q0"));
 }
 
-} // end anonymous namespace
+}
diff --git a/llvm/unittests/ADT/SmallVectorTest.cpp b/llvm/unittests/ADT/SmallVectorTest.cpp
index bf9de88ffc0..7367ad470e3 100644
--- a/llvm/unittests/ADT/SmallVectorTest.cpp
+++ b/llvm/unittests/ADT/SmallVectorTest.cpp
@@ -15,10 +15,8 @@
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Support/Compiler.h"
 #include "gtest/gtest.h"
-#include <cstdarg>
-#include <cstdlib>
 #include <list>
-#include <utility>
+#include <stdarg.h>
 
 using namespace llvm;
 
@@ -143,10 +141,9 @@ int Constructable::numCopyAssignmentCalls;
 int Constructable::numMoveAssignmentCalls;
 
 struct NonCopyable {
-  NonCopyable() = default;
-  NonCopyable(NonCopyable &&) = default;
+  NonCopyable() {}
+  NonCopyable(NonCopyable &&) {}
   NonCopyable &operator=(NonCopyable &&) { return *this; }
-
 private:
   NonCopyable(const NonCopyable &) = delete;
   NonCopyable &operator=(const NonCopyable &) = delete;
@@ -203,6 +200,7 @@ protected:
   VectorT otherVector;
 };
 
+
 typedef ::testing::Types<SmallVector<Constructable, 0>,
                          SmallVector<Constructable, 1>,
                          SmallVector<Constructable, 2>,
@@ -524,6 +522,7 @@ TYPED_TEST(SmallVectorTest, InsertRepeatedTest) {
   this->assertValuesInOrder(this->theVector, 6u, 1, 16, 16, 2, 3, 4);
 }
 
+
 TYPED_TEST(SmallVectorTest, InsertRepeatedAtEndTest) {
   SCOPED_TRACE("InsertRepeatedTest");
 
@@ -582,6 +581,7 @@ TYPED_TEST(SmallVectorTest, InsertRangeTest) {
   this->assertValuesInOrder(this->theVector, 6u, 1, 77, 77, 77, 2, 3);
 }
 
+
 TYPED_TEST(SmallVectorTest, InsertRangeAtEndTest) {
   SCOPED_TRACE("InsertRangeTest");
 
@@ -748,14 +748,11 @@ TEST(SmallVectorCustomTest, NoAssignTest) {
 
 struct MovedFrom {
   bool hasValue;
-
   MovedFrom() : hasValue(true) {
   }
-
   MovedFrom(MovedFrom&& m) : hasValue(m.hasValue) {
     m.hasValue = false;
   }
-
   MovedFrom &operator=(MovedFrom&& m) {
     hasValue = m.hasValue;
     m.hasValue = false;
@@ -778,7 +775,6 @@ enum EmplaceableArgState {
   EAS_RValue,
   EAS_Failure
 };
-
 template <int I> struct EmplaceableArg {
   EmplaceableArgState State;
   EmplaceableArg() : State(EAS_Defaulted) {}
@@ -928,4 +924,4 @@ TEST(SmallVectorTest, InitializerList) {
   EXPECT_TRUE(makeArrayRef(V2).equals({4, 5, 3, 2}));
 }
 
-} // end anonymous namespace
+} // end namespace
diff --git a/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp b/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp
index fa7d7780a8a..776d26970a3 100644
--- a/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp
@@ -13,10 +13,10 @@
 #include "llvm-c/OrcBindings.h"
 #include "llvm-c/Target.h"
 #include "llvm-c/TargetMachine.h"
-#include "llvm/ADT/Triple.h"
 
-#include <cstring>
-#include <memory>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 namespace llvm {
 
@@ -157,4 +157,4 @@ TEST_F(OrcCAPIExecutionTest, TestDirectCallbacksAPI) {
   LLVMOrcDisposeInstance(JIT);
 }
 
-} // end namespace llvm
+} // namespace llvm
diff --git a/llvm/unittests/Support/CommandLineTest.cpp b/llvm/unittests/Support/CommandLineTest.cpp
index bb8a9487402..eac669f467b 100644
--- a/llvm/unittests/Support/CommandLineTest.cpp
+++ b/llvm/unittests/Support/CommandLineTest.cpp
@@ -7,17 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/StringRef.h"
 #include "llvm/Config/config.h"
-#include "llvm/Support/Allocator.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/StringSaver.h"
 #include "gtest/gtest.h"
-#include <cstdlib>
+#include <stdlib.h>
 #include <string>
 
 using namespace llvm;
@@ -25,7 +20,7 @@ using namespace llvm;
 namespace {
 
 class TempEnvVar {
-public:
+ public:
   TempEnvVar(const char *name, const char *value)
       : name(name) {
     const char *old_value = getenv(name);
@@ -46,14 +41,13 @@ public:
 #endif
   }
 
-private:
+ private:
   const char *const name;
 };
 
 template <typename T>
 class StackOption : public cl::opt<T> {
   typedef cl::opt<T> Base;
-
 public:
   // One option...
   template<class M0t>
@@ -75,6 +69,7 @@ public:
   ~StackOption() override { this->removeArgument(); }
 };
 
+
 cl::OptionCategory TestCategory("Test Options", "Description");
 TEST(CommandLineTest, ModifyExisitingOption) {
   StackOption<int> TestOption("test-option", cl::desc("old description"));
@@ -270,4 +265,4 @@ TEST(CommandLineTest, HideUnrelatedOptionsMulti) {
       << "Hid default option that should be visable.";
 }
 
-} // end anonymous namespace
+}  // anonymous namespace
diff --git a/llvm/unittests/Support/ProgramTest.cpp b/llvm/unittests/Support/ProgramTest.cpp
index cee9f0bddae..deadaadec1d 100644
--- a/llvm/unittests/Support/ProgramTest.cpp
+++ b/llvm/unittests/Support/ProgramTest.cpp
@@ -7,19 +7,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/StringRef.h"
 #include "llvm/Support/ConvertUTF.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Program.h"
-#include "llvm/Support/raw_ostream.h"
 #include "gtest/gtest.h"
-#include <cstdlib>
-#include <cstring>
-#include <string>
-#include <vector>
+#include <stdlib.h>
 #if defined(__APPLE__)
 # include <crt_externs.h>
 #elif !defined(_MSC_VER)
@@ -51,7 +45,6 @@ void sleep_for(unsigned int seconds) {
     GTEST_FATAL_FAILURE_(MessageStorage.c_str());                              \
   } else {                                                                     \
   }
-
 // From TestMain.cpp.
 extern const char *TestMainArgv0;
 
@@ -60,9 +53,9 @@ namespace {
 using namespace llvm;
 using namespace sys;
 
-cl::opt<std::string>
+static cl::opt<std::string>
 ProgramTestStringArg1("program-test-string-arg1");
-cl::opt<std::string>
+static cl::opt<std::string>
 ProgramTestStringArg2("program-test-string-arg2");
 
 class ProgramEnvTest : public testing::Test {
@@ -316,6 +309,7 @@ TEST(ProgramTest, TestExecuteNegative) {
     ASSERT_TRUE(ExecutionFailed);
     ASSERT_FALSE(Error.empty());
   }
+
 }
 
 #ifdef LLVM_ON_WIN32
diff --git a/llvm/unittests/Support/StreamingMemoryObjectTest.cpp b/llvm/unittests/Support/StreamingMemoryObjectTest.cpp
index cb1520b2edc..836dfa9084f 100644
--- a/llvm/unittests/Support/StreamingMemoryObjectTest.cpp
+++ b/llvm/unittests/Support/StreamingMemoryObjectTest.cpp
@@ -11,7 +11,7 @@
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/StreamingMemoryObject.h"
 #include "gtest/gtest.h"
-#include <cstring>
+#include <string.h>
 
 using namespace llvm;
 
@@ -65,4 +65,4 @@ TEST(StreamingMemoryObjectTest, getPointer) {
   EXPECT_TRUE(std::equal(InputBuffer, InputBuffer + 8, O.getPointer(0, 20)));
 }
 
-} // end anonymous namespace
+} // end namespace
diff --git a/llvm/unittests/Support/TimeValueTest.cpp b/llvm/unittests/Support/TimeValueTest.cpp
index 59af5c3044d..3d2b9780c06 100644
--- a/llvm/unittests/Support/TimeValueTest.cpp
+++ b/llvm/unittests/Support/TimeValueTest.cpp
@@ -9,12 +9,9 @@
 
 #include "gtest/gtest.h"
 #include "llvm/Support/TimeValue.h"
-#include <cstdint>
-#include <cstdlib>
-#include <ctime>
+#include <time.h>
 
 using namespace llvm;
-
 namespace {
 
 TEST(TimeValue, time_t) {
@@ -40,4 +37,4 @@ TEST(TimeValue, Win32FILETIME) {
   EXPECT_EQ(ft1970, epoch.toWin32Time());
 }
 
-} // end anonymous namespace
+}
diff --git a/llvm/unittests/Support/TimerTest.cpp b/llvm/unittests/Support/TimerTest.cpp
index 8f05b353476..f556a3f72c6 100644
--- a/llvm/unittests/Support/TimerTest.cpp
+++ b/llvm/unittests/Support/TimerTest.cpp
@@ -13,7 +13,7 @@
 #if LLVM_ON_WIN32
 #include <windows.h>
 #else
-#include <ctime>
+#include <time.h>
 #endif
 
 using namespace llvm;
@@ -62,4 +62,4 @@ TEST(Timer, CheckIfTriggered) {
   EXPECT_FALSE(T1.hasTriggered());
 }
 
-} // end anonymous namespace
+} // end anon namespace