diff options
| author | Vladimir Marko <vmarko@google.com> | 2015-06-16 11:32:01 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2015-06-16 11:32:01 +0000 |
| commit | fbeb4aede0ddc5b1e6a5a3a40cc6266fe8518c98 (patch) | |
| tree | 76ab28cf259def4dccec529df217fd760f27d2aa /compiler/utils/assembler.cc | |
| parent | f38caa68cce551fb153dff37d01db518e58ed00f (diff) | |
Revert "ART: Implement literal pool for arm, fix branch fixup."
This reverts commit f38caa68cce551fb153dff37d01db518e58ed00f.
Change-Id: Id88b82cc949d288cfcdb3c401b96f884b777fc40
Reason: broke the tests.
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); |