diff options
author | Vladimir Marko <vmarko@google.com> | 2015-06-16 11:32:24 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-06-16 11:32:25 +0000 |
commit | db40ea768bd914125c3754dacb9b6f534a2e2399 (patch) | |
tree | af87ccb86c7e0622912bf088a464716166ea450a /compiler/utils/assembler.cc | |
parent | e4394f7de28ae0b517daa033749979e46ff676ab (diff) | |
parent | fbeb4aede0ddc5b1e6a5a3a40cc6266fe8518c98 (diff) |
Merge "Revert "ART: Implement literal pool for arm, fix branch fixup.""
Diffstat (limited to 'compiler/utils/assembler.cc')
-rw-r--r-- | compiler/utils/assembler.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/utils/assembler.cc b/compiler/utils/assembler.cc index 6d8a98931f..b016e74aba 100644 --- a/compiler/utils/assembler.cc +++ b/compiler/utils/assembler.cc @@ -80,11 +80,10 @@ void AssemblerBuffer::FinalizeInstructions(const MemoryRegion& instructions) { } -void AssemblerBuffer::ExtendCapacity(size_t min_capacity) { +void AssemblerBuffer::ExtendCapacity() { size_t old_size = Size(); size_t old_capacity = Capacity(); size_t new_capacity = std::min(old_capacity * 2, old_capacity + 1 * MB); - new_capacity = std::max(new_capacity, min_capacity); // Allocate the new data area and copy contents of the old one to it. uint8_t* new_contents = NewContents(new_capacity); |