diff options
author | 2015-10-01 20:57:57 +0100 | |
---|---|---|
committer | 2015-10-08 11:10:18 +0100 | |
commit | ec7802a102d49ab5c17495118d4fe0bcc7287beb (patch) | |
tree | 08649609604b9c96bc48ca071c48b0af5abb1a3f /compiler/gc_map_builder.h | |
parent | b2e436ffcda1d7a87e7bf9133d8ed878388c73c2 (diff) |
Add DCHECKs to ArenaVector and ScopedArenaVector.
Implement dchecked_vector<> template that DCHECK()s element
access and insert()/emplace()/erase() positions. Change the
ArenaVector<> and ScopedArenaVector<> aliases to use the new
template instead of std::vector<>. Remove DCHECK()s that
have now become unnecessary from the Optimizing compiler.
Change-Id: Ib8506bd30d223f68f52bd4476c76d9991acacadc
Diffstat (limited to 'compiler/gc_map_builder.h')
-rw-r--r-- | compiler/gc_map_builder.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/gc_map_builder.h b/compiler/gc_map_builder.h index 45e3fc5589..2ef7f1a659 100644 --- a/compiler/gc_map_builder.h +++ b/compiler/gc_map_builder.h @@ -26,14 +26,16 @@ namespace art { class GcMapBuilder { public: - template <typename Alloc> - GcMapBuilder(std::vector<uint8_t, Alloc>* table, size_t entries, uint32_t max_native_offset, + template <typename Vector> + GcMapBuilder(Vector* table, size_t entries, uint32_t max_native_offset, size_t references_width) : entries_(entries), references_width_(entries != 0u ? references_width : 0u), native_offset_width_(entries != 0 && max_native_offset != 0 ? sizeof(max_native_offset) - CLZ(max_native_offset) / 8u : 0u), in_use_(entries) { + static_assert(std::is_same<typename Vector::value_type, uint8_t>::value, "Invalid value type"); + // Resize table and set up header. table->resize((EntryWidth() * entries) + sizeof(uint32_t)); table_ = table->data(); |