commit e0c64e15a4b3349dbab5b35e1f1bbbd8a03a8a0d
author Greg Clayton <gclayton@apple.com> Thu Apr 18 22:01:06 2013 +0000
committer Greg Clayton <gclayton@apple.com> Thu Apr 18 22:01:06 2013 +0000
tree 61611bdecfad4c5b2af36396cc744db825d202c3
parent 6a97e89df6304a527dca48a9708b23757953a569

Try to unbreak the lldb-x86_64-linux buildbot after recent std::auto_ptr/std::unique_ptr changes.

llvm-svn: 179799

lldb/source/Expression/IRMemoryMap.cpp

diff --git a/lldb/source/Expression/IRMemoryMap.cpp b/lldb/source/Expression/IRMemoryMap.cpp
index 84ad8eb..fedbc24 100644
--- a/lldb/source/Expression/IRMemoryMap.cpp
+++ b/lldb/source/Expression/IRMemoryMap.cpp
@@ -241,12 +241,12 @@
     default:
         assert (0 && "We cannot reach this!");
     case eAllocationPolicyHostOnly:
-        allocation.m_data.reset(new DataBufferHeap(size, 0));
+        allocation.m_data_ap.reset(new DataBufferHeap(size, 0));
         break;
     case eAllocationPolicyProcessOnly:
         break;
     case eAllocationPolicyMirror:
-        allocation.m_data.reset(new DataBufferHeap(size, 0));
+        allocation.m_data_ap.reset(new DataBufferHeap(size, 0));
         break;
     }
     
@@ -355,22 +355,22 @@
         error.SetErrorString("Couldn't write: invalid allocation policy");
         return;
     case eAllocationPolicyHostOnly:
-        if (!allocation.m_data)
+        if (!allocation.m_data_ap.get())
         {
             error.SetErrorToGenericError();
             error.SetErrorString("Couldn't write: data buffer is empty");
             return;
         }
-        ::memcpy (allocation.m_data->GetBytes() + offset, bytes, size);
+        ::memcpy (allocation.m_data_ap->GetBytes() + offset, bytes, size);
         break;
     case eAllocationPolicyMirror:
-        if (!allocation.m_data)
+        if (!allocation.m_data_ap.get())
         {
             error.SetErrorToGenericError();
             error.SetErrorString("Couldn't write: data buffer is empty");
             return;
         }
-        ::memcpy (allocation.m_data->GetBytes() + offset, bytes, size);
+        ::memcpy (allocation.m_data_ap->GetBytes() + offset, bytes, size);
         process_sp = m_process_wp.lock();
         if (process_sp)
         {
@@ -485,13 +485,13 @@
         error.SetErrorString("Couldn't read: invalid allocation policy");
         return;
     case eAllocationPolicyHostOnly:
-        if (!allocation.m_data)
+        if (!allocation.m_data_ap.get())
         {
             error.SetErrorToGenericError();
             error.SetErrorString("Couldn't read: data buffer is empty");
             return;
         }
-        ::memcpy (bytes, allocation.m_data->GetBytes() + offset, size);
+        ::memcpy (bytes, allocation.m_data_ap->GetBytes() + offset, size);
         break;
     case eAllocationPolicyMirror:
         process_sp = m_process_wp.lock();
@@ -503,13 +503,13 @@
         }
         else
         {
-            if (!allocation.m_data)
+            if (!allocation.m_data_ap.get())
             {
                 error.SetErrorToGenericError();
                 error.SetErrorString("Couldn't read: data buffer is empty");
                 return;
             }
-            ::memcpy (bytes, allocation.m_data->GetBytes() + offset, size);
+            ::memcpy (bytes, allocation.m_data_ap->GetBytes() + offset, size);
         }
         break;
     case eAllocationPolicyProcessOnly:
@@ -619,7 +619,7 @@
             {
                 lldb::ProcessSP process_sp = m_process_wp.lock();
 
-                if (!allocation.m_data.get())
+                if (!allocation.m_data_ap.get())
                 {
                     error.SetErrorToGenericError();
                     error.SetErrorString("Couldn't get memory data: data buffer is empty");
@@ -627,23 +627,23 @@
                 }
                 if (process_sp)
                 {
-                    process_sp->ReadMemory(allocation.m_process_start, allocation.m_data->GetBytes(), allocation.m_data->GetByteSize(), error);
+                    process_sp->ReadMemory(allocation.m_process_start, allocation.m_data_ap->GetBytes(), allocation.m_data_ap->GetByteSize(), error);
                     if (!error.Success())
                         return;
                     uint64_t offset = process_address - allocation.m_process_start;
-                    extractor = DataExtractor(allocation.m_data->GetBytes() + offset, size, GetByteOrder(), GetAddressByteSize());
+                    extractor = DataExtractor(allocation.m_data_ap->GetBytes() + offset, size, GetByteOrder(), GetAddressByteSize());
                     return;
                 }
             }
         case eAllocationPolicyHostOnly:
-            if (!allocation.m_data.get())
+            if (!allocation.m_data_ap.get())
             {
                 error.SetErrorToGenericError();
                 error.SetErrorString("Couldn't get memory data: data buffer is empty");
                 return;
             }
             uint64_t offset = process_address - allocation.m_process_start;
-            extractor = DataExtractor(allocation.m_data->GetBytes() + offset, size, GetByteOrder(), GetAddressByteSize());
+            extractor = DataExtractor(allocation.m_data_ap->GetBytes() + offset, size, GetByteOrder(), GetAddressByteSize());
             return;
         }
     }