summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Callanan <scallanan@apple.com>2013-04-19 02:42:00 +0000
committerSean Callanan <scallanan@apple.com>2013-04-19 02:42:00 +0000
commit7d71e5677ec2d200e95143954e5339521884873a (patch)
tree87659ddb779e0c60006cf36071ca4442d8a4bf60
parent17f9e8b3ce3019c5b42f002335fbde4922b3dfbc (diff)
downloadbcm5719-llvm-7d71e5677ec2d200e95143954e5339521884873a.tar.gz
bcm5719-llvm-7d71e5677ec2d200e95143954e5339521884873a.zip
Reverted 179810, which breaks the expression
parser. llvm-svn: 179832
-rw-r--r--lldb/source/Expression/IRMemoryMap.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/lldb/source/Expression/IRMemoryMap.cpp b/lldb/source/Expression/IRMemoryMap.cpp
index 9a6f4479a54..37e089469f1 100644
--- a/lldb/source/Expression/IRMemoryMap.cpp
+++ b/lldb/source/Expression/IRMemoryMap.cpp
@@ -272,7 +272,7 @@ IRMemoryMap::Malloc (size_t size, uint8_t alignment, uint32_t permissions, Alloc
lldb::addr_t mask = alignment - 1;
aligned_address = (allocation_address + mask) & (~mask);
- Allocation allocation;
+ Allocation &allocation(m_allocations[aligned_address]);
allocation.m_process_alloc = allocation_address;
allocation.m_process_start = aligned_address;
@@ -281,8 +281,6 @@ IRMemoryMap::Malloc (size_t size, uint8_t alignment, uint32_t permissions, Alloc
allocation.m_alignment = alignment;
allocation.m_policy = policy;
- m_allocations[aligned_address] = std::move(allocation);
-
switch (policy)
{
default:
OpenPOWER on IntegriCloud