Move Log from Core -> Utility.

All references to Host and Core have been removed, so this
class can now safely be lowered into Utility.

Differential Revision: https://reviews.llvm.org/D30559

llvm-svn: 296909

3 files changed, 5 insertions, 5 deletions

diff --git a/lldb/unittests/Core/CMakeLists.txt b/lldb/unittests/Core/CMakeLists.txt
index 642ad0223d2..73dd0d83fee 100644
--- a/lldb/unittests/Core/CMakeLists.txt
+++ b/lldb/unittests/Core/CMakeLists.txt
@@ -3,7 +3,6 @@ add_lldb_unittest(LLDBCoreTests
   BroadcasterTest.cpp
   DataExtractorTest.cpp
   ListenerTest.cpp
-  LogTest.cpp
   ScalarTest.cpp
   StateTest.cpp
   StreamCallbackTest.cpp
diff --git a/lldb/unittests/Utility/CMakeLists.txt b/lldb/unittests/Utility/CMakeLists.txt
index 9596abb8cfd..782f4e52ed7 100644
--- a/lldb/unittests/Utility/CMakeLists.txt
+++ b/lldb/unittests/Utility/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_lldb_unittest(UtilityTests
   ConstStringTest.cpp
   ErrorTest.cpp
+  LogTest.cpp
   NameMatchesTest.cpp
   StringExtractorTest.cpp
   TaskPoolTest.cpp
diff --git a/lldb/unittests/Core/LogTest.cpp b/lldb/unittests/Utility/LogTest.cpp
index 8b9868f18e4..33b5b55aa30 100644
--- a/lldb/unittests/Core/LogTest.cpp
+++ b/lldb/unittests/Utility/LogTest.cpp
@@ -9,10 +9,10 @@
 
 #include "gtest/gtest.h"
 
-#include "lldb/Core/Log.h"
-#include "lldb/Host/Host.h"
+#include "lldb/Utility/Log.h"
 #include "lldb/Utility/StreamString.h"
 #include "llvm/Support/ManagedStatic.h"
+#include "llvm/Support/Threading.h"
 #include <thread>
 
 using namespace lldb;
@@ -74,8 +74,8 @@ TEST(LogTest, log_options) {
       GetLogString(LLDB_LOG_OPTION_PREPEND_FILE_FUNCTION, "Hello World {0}", 47));
 
   EXPECT_EQ(llvm::formatv("[{0,0+4}/{1,0+4}] Hello World 47\n",
-                          Host::GetCurrentProcessID(),
-                          Host::GetCurrentThreadID())
+                          ::getpid(),
+                          llvm::get_threadid_np())
                 .str(),
             GetLogString(LLDB_LOG_OPTION_PREPEND_PROC_AND_THREAD,
                          "Hello World {0}", 47));