svn commit: r294166 - in vendor/lldb/dist: include/lldb/Target source/API

[Dimitry Andric]

Author: dim
Date: Sat Jan 16 17:22:30 2016
New Revision: 294166
URL: https://svnweb.freebsd.org/changeset/base/294166

Log:
  Vendor import of lldb release_38 branch r257836:
  https://llvm.org/svn/llvm-project/lldb/branches/release_38@257836

Modified:
  vendor/lldb/dist/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h
  vendor/lldb/dist/source/API/SBProcess.cpp

Modified: vendor/lldb/dist/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h
==============================================================================
--- vendor/lldb/dist/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h	Sat Jan 16 17:21:39 2016	(r294165)
+++ vendor/lldb/dist/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h	Sat Jan 16 17:22:30 2016	(r294166)
@@ -20,7 +20,7 @@
 #include "lldb/Target/ThreadPlanCallFunction.h"
 
 #include "llvm/ADT/ArrayRef.h"
-#include "llvm/IR/Type.h"
+#include "llvm/IR/DerivedTypes.h"
 
 namespace lldb_private {
 

Modified: vendor/lldb/dist/source/API/SBProcess.cpp
==============================================================================
--- vendor/lldb/dist/source/API/SBProcess.cpp	Sat Jan 16 17:21:39 2016	(r294165)
+++ vendor/lldb/dist/source/API/SBProcess.cpp	Sat Jan 16 17:22:30 2016	(r294166)
@@ -1000,7 +1000,8 @@ SBProcess::GetRestartedFromEvent (const 
     bool ret_val = Process::ProcessEventData::GetRestartedFromEvent (event.get());
 
     if (log)
-        log->Printf ("SBProcess::%s (event.sp=%p) => %d", __FUNCTION__, event.get(), ret_val);
+        log->Printf ("SBProcess::%s (event.sp=%p) => %d", __FUNCTION__,
+                     static_cast<void*>(event.get()), ret_val);
 
     return ret_val;
 }