diff options
| author | Ian Rogers <irogers@google.com> | 2012-08-28 15:54:19 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2012-08-28 15:54:19 -0700 |
| commit | 2f30ef57ceb02ee5d6719d2158bd9bca4723687d (patch) | |
| tree | 39b192a36063a07ba7c5e9779d5bf2fe1982d462 /vm/alloc/MarkSweep.cpp | |
| parent | 808a7c0e7e39b7ca3c7db1366e6e4089166052bb (diff) | |
| download | android_dalvik-2f30ef57ceb02ee5d6719d2158bd9bca4723687d.tar.gz android_dalvik-2f30ef57ceb02ee5d6719d2158bd9bca4723687d.tar.bz2 android_dalvik-2f30ef57ceb02ee5d6719d2158bd9bca4723687d.zip | |
Revert "Revert "Trim pre-Zygote fork, fix under-estimate of heap limit.""
This reverts commit 4c7e27186d87ccd40646fd4f514dc982ff5b40b1.
Diffstat (limited to 'vm/alloc/MarkSweep.cpp')
| -rw-r--r-- | vm/alloc/MarkSweep.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/alloc/MarkSweep.cpp b/vm/alloc/MarkSweep.cpp index d4f4669ba..268d88085 100644 --- a/vm/alloc/MarkSweep.cpp +++ b/vm/alloc/MarkSweep.cpp @@ -560,7 +560,7 @@ static void scanGrayObjects(GcMarkContext *ctx) footprint = dvmHeapSourceGetValue(HS_FOOTPRINT, NULL, 0); base = &h->cardTableBase[0]; - limit = dvmCardFromAddr((u1 *)dvmHeapSourceGetBase() + footprint); + limit = dvmCardFromAddr((u1 *)dvmHeapSourceGetLimit()); assert(limit <= &h->cardTableBase[h->cardTableLength]); ptr = base; |