From 12004ebe2fd602f5b7a8eacae5cc125b7bb5c932 Mon Sep 17 00:00:00 2001
From: Zachary Turner <zturner@google.com>
Date: Wed, 2 Sep 2015 16:47:47 +0000
Subject: [PATCH] Try to fix FreeBSD build.

llvm-svn: 246672
---
 .../Process/FreeBSD/ProcessFreeBSD.cpp        | 24 +++++++++----------
 .../Plugins/Process/FreeBSD/ProcessFreeBSD.h  |  6 ++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp b/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
index 4094169bc294..c6d6a4e80678 100644
--- a/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
+++ b/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
@@ -62,13 +62,13 @@ namespace
 // Static functions.
 
 lldb::ProcessSP
-ProcessFreeBSD::CreateInstance(Target& target,
+ProcessFreeBSD::CreateInstance(lldb::TargetSP target_sp,
                                Listener &listener,
                                const FileSpec *crash_file_path)
 {
     lldb::ProcessSP process_sp;
     if (crash_file_path == NULL)
-        process_sp.reset(new ProcessFreeBSD (target, listener, GetFreeBSDSignals()));
+        process_sp.reset(new ProcessFreeBSD (target_sp, listener, GetFreeBSDSignals()));
     return process_sp;
 }
 
@@ -286,8 +286,8 @@ ProcessFreeBSD::SendMessage(const ProcessMessage &message)
 //------------------------------------------------------------------------------
 // Constructors and destructors.
 
-ProcessFreeBSD::ProcessFreeBSD(Target& target, Listener &listener, UnixSignalsSP &unix_signals_sp)
-    : Process(target, listener, unix_signals_sp),
+ProcessFreeBSD::ProcessFreeBSD(lldb::TargetSP target_sp, Listener &listener, UnixSignalsSP &unix_signals_sp)
+    : Process(target_sp, listener, unix_signals_sp),
       m_byte_order(lldb::endian::InlHostByteOrder()),
       m_monitor(NULL),
       m_module(NULL),
@@ -320,10 +320,10 @@ ProcessFreeBSD::Finalize()
 }
 
 bool
-ProcessFreeBSD::CanDebug(Target &target, bool plugin_specified_by_name)
+ProcessFreeBSD::CanDebug(lldb::TargetSP target_sp, bool plugin_specified_by_name)
 {
     // For now we are just making sure the file exists for a given module
-    ModuleSP exe_module_sp(target.GetExecutableModule());
+    ModuleSP exe_module_sp(target_sp->GetExecutableModule());
     if (exe_module_sp.get())
         return exe_module_sp->GetFileSpec().Exists();
     // If there is no executable module, we return true since we might be preparing to attach.
@@ -345,7 +345,7 @@ ProcessFreeBSD::DoAttachToProcessWithID (lldb::pid_t pid,  const ProcessAttachIn
     if (!error.Success())
         return error;
 
-    PlatformSP platform_sp (m_target.GetPlatform ());
+    PlatformSP platform_sp (GetTarget().GetPlatform ());
     assert (platform_sp.get());
     if (!platform_sp)
         return error;  // FIXME: Detatch?
@@ -357,7 +357,7 @@ ProcessFreeBSD::DoAttachToProcessWithID (lldb::pid_t pid,  const ProcessAttachIn
     // Resolve the executable module
     ModuleSP exe_module_sp;
     FileSpecList executable_search_paths (Target::GetDefaultExecutableSearchPaths());
-    ModuleSpec exe_module_spec(process_info.GetExecutableFile(), m_target.GetArchitecture());
+    ModuleSpec exe_module_spec(process_info.GetExecutableFile(), GetTarget().GetArchitecture());
     error = platform_sp->ResolveExecutable(exe_module_spec,
                                            exe_module_sp,
                                            executable_search_paths.GetSize() ? &executable_search_paths : NULL);
@@ -366,11 +366,11 @@ ProcessFreeBSD::DoAttachToProcessWithID (lldb::pid_t pid,  const ProcessAttachIn
 
     // Fix the target architecture if necessary
     const ArchSpec &module_arch = exe_module_sp->GetArchitecture();
-    if (module_arch.IsValid() && !m_target.GetArchitecture().IsExactMatch(module_arch))
-        m_target.SetArchitecture(module_arch);
+    if (module_arch.IsValid() && !GetTarget().GetArchitecture().IsExactMatch(module_arch))
+        GetTarget().SetArchitecture(module_arch);
 
     // Initialize the target module list
-    m_target.SetExecutableModule (exe_module_sp, true);
+    GetTarget().SetExecutableModule (exe_module_sp, true);
 
     SetSTDIOFileDescriptor(m_monitor->GetTerminalFD());
 
@@ -1052,7 +1052,7 @@ const DataBufferSP
 ProcessFreeBSD::GetAuxvData ()
 {
     // If we're the local platform, we can ask the host for auxv data.
-    PlatformSP platform_sp = m_target.GetPlatform ();
+    PlatformSP platform_sp = GetTarget().GetPlatform ();
     if (platform_sp && platform_sp->IsHost ())
         return lldb_private::Host::GetAuxvData(this);
 
diff --git a/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h b/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h
index 379d7ea97918..54553eb1604b 100644
--- a/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h
+++ b/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h
@@ -34,7 +34,7 @@ public:
     // Static functions.
     //------------------------------------------------------------------
     static lldb::ProcessSP
-    CreateInstance(lldb_private::Target& target,
+    CreateInstance(lldb::TargetSP target_sp,
                    lldb_private::Listener &listener,
                    const lldb_private::FileSpec *crash_file_path);
 
@@ -53,7 +53,7 @@ public:
     //------------------------------------------------------------------
     // Constructors and destructors
     //------------------------------------------------------------------
-    ProcessFreeBSD(lldb_private::Target& target,
+    ProcessFreeBSD(lldb::TargetSP target_sp,
                    lldb_private::Listener &listener,
                    lldb::UnixSignalsSP &unix_signals_sp);
 
@@ -90,7 +90,7 @@ public:
     Finalize() override;
 
     bool
-    CanDebug(lldb_private::Target &target, bool plugin_specified_by_name) override;
+    CanDebug(lldb::TargetSP target_sp, bool plugin_specified_by_name) override;
 
     lldb_private::Error
     WillLaunch(lldb_private::Module *module) override;