diff options
| author | Andreas Gampe <agampe@google.com> | 2014-03-24 18:53:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-24 18:53:17 +0000 |
| commit | 4d3e8b019c86abfdb761a14e442fc058882a4d91 (patch) | |
| tree | cfc692649b042a5471ed45a300cc17824d1ac16a /runtime/mem_map.cc | |
| parent | d11fcd3d2882c90efe7a92875072bd4eec4aad0c (diff) | |
| parent | 9de65ff3a9c49b91d80be292020f012f3d0a24ef (diff) | |
| download | art-4d3e8b019c86abfdb761a14e442fc058882a4d91.tar.gz art-4d3e8b019c86abfdb761a14e442fc058882a4d91.tar.bz2 art-4d3e8b019c86abfdb761a14e442fc058882a4d91.zip | |
Merge "Fixes to mem_map wraparound and ARM64 quick_invoke assembly"
Diffstat (limited to 'runtime/mem_map.cc')
| -rw-r--r-- | runtime/mem_map.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/mem_map.cc b/runtime/mem_map.cc index 5b2bf656f5..1594338df3 100644 --- a/runtime/mem_map.cc +++ b/runtime/mem_map.cc @@ -145,7 +145,7 @@ MemMap* MemMap::MapAnonymous(const char* name, byte* expected, size_t byte_count // Not enough memory until 4GB. if (first_run) { // Try another time from the bottom; - next_mem_pos_ = LOW_MEM_START; + ptr = LOW_MEM_START - kPageSize; first_run = false; continue; } else { |