summaryrefslogtreecommitdiffstats
path: root/llvm/tools/lli/RemoteMemoryManager.h
diff options
context:
space:
mode:
authorAndrew Kaylor <andrew.kaylor@intel.com>2013-10-04 20:09:36 +0000
committerAndrew Kaylor <andrew.kaylor@intel.com>2013-10-04 20:09:36 +0000
commit972317651105e477e77a617ddedfaa5dc87d6437 (patch)
tree066655a66b1bafe1b3d78976ea996cf7167a6acc /llvm/tools/lli/RemoteMemoryManager.h
parentc19d6f096c0ffc304adc524df9155a1589e7c416 (diff)
downloadbcm5719-llvm-972317651105e477e77a617ddedfaa5dc87d6437.tar.gz
bcm5719-llvm-972317651105e477e77a617ddedfaa5dc87d6437.zip
Fixing container/pointer bug in remote-lli found by ASan
llvm-svn: 191976
Diffstat (limited to 'llvm/tools/lli/RemoteMemoryManager.h')
-rw-r--r--llvm/tools/lli/RemoteMemoryManager.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/tools/lli/RemoteMemoryManager.h b/llvm/tools/lli/RemoteMemoryManager.h
index dc746666726..ca157a79298 100644
--- a/llvm/tools/lli/RemoteMemoryManager.h
+++ b/llvm/tools/lli/RemoteMemoryManager.h
@@ -30,6 +30,7 @@ class RemoteMemoryManager : public JITMemoryManager {
public:
// Notice that this structure takes ownership of the memory allocated.
struct Allocation {
+ Allocation() {}
Allocation(sys::MemoryBlock mb, unsigned a, bool code)
: MB(mb), Alignment(a), IsCode(code) {}
@@ -48,11 +49,11 @@ private:
// have allocated locally but have not yet remapped for the remote target.
// When we receive notification of a completed module load, we will map
// these sections into the remote target.
- SmallVector<const Allocation *, 2> UnmappedSections;
+ SmallVector<Allocation, 2> UnmappedSections;
// This map tracks the sections we have remapped for the remote target
// but have not yet copied to the target.
- DenseMap<uint64_t, const Allocation *> MappedSections;
+ DenseMap<uint64_t, Allocation> MappedSections;
// FIXME: This is part of a work around to keep sections near one another
// when MCJIT performs relocations after code emission but before
OpenPOWER on IntegriCloud