Optimizing: Tag Arena allocations with their source.
This adds the ability to track where we allocate memory
when the kArenaAllocatorCountAllocations flag is turned on.
Also move some allocations from native heap to the Arena
and remove some unnecessary utilities.
Bug: 23736311
Change-Id: I1aaef3fd405d1de444fe9e618b1ce7ecef07ade3
diff --git a/runtime/leb128.h b/runtime/leb128.h
index 976936d..baf9da2 100644
--- a/runtime/leb128.h
+++ b/runtime/leb128.h
@@ -178,10 +178,11 @@
dest->push_back(out);
}
-// An encoder that pushed uint32_t data onto the given std::vector.
+// An encoder that pushes int32_t/uint32_t data onto the given std::vector.
+template <typename Allocator = std::allocator<uint8_t>>
class Leb128Encoder {
public:
- explicit Leb128Encoder(std::vector<uint8_t>* data) : data_(data) {
+ explicit Leb128Encoder(std::vector<uint8_t, Allocator>* data) : data_(data) {
DCHECK(data != nullptr);
}
@@ -211,22 +212,27 @@
}
}
- const std::vector<uint8_t>& GetData() const {
+ const std::vector<uint8_t, Allocator>& GetData() const {
return *data_;
}
protected:
- std::vector<uint8_t>* const data_;
+ std::vector<uint8_t, Allocator>* const data_;
private:
DISALLOW_COPY_AND_ASSIGN(Leb128Encoder);
};
// An encoder with an API similar to vector<uint32_t> where the data is captured in ULEB128 format.
-class Leb128EncodingVector FINAL : private std::vector<uint8_t>, public Leb128Encoder {
+template <typename Allocator = std::allocator<uint8_t>>
+class Leb128EncodingVector FINAL : private std::vector<uint8_t, Allocator>,
+ public Leb128Encoder<Allocator> {
public:
- Leb128EncodingVector() : Leb128Encoder(this) {
- }
+ Leb128EncodingVector() : Leb128Encoder<Allocator>(this) { }
+
+ explicit Leb128EncodingVector(const Allocator& alloc)
+ : std::vector<uint8_t, Allocator>(alloc),
+ Leb128Encoder<Allocator>(this) { }
private:
DISALLOW_COPY_AND_ASSIGN(Leb128EncodingVector);