Revert "ART: Fast copy stack mask"
DCHECK failure, need to investigate
This reverts commit 6b10c9b2c0e62193ab9df4d63aedea1d0798e742.
Change-Id: Ie1d1cc6fb71367bc5ac5d6a260af8de316a758dd
diff --git a/runtime/base/bit_vector.h b/runtime/base/bit_vector.h
index afa8dc1..17835f5 100644
--- a/runtime/base/bit_vector.h
+++ b/runtime/base/bit_vector.h
@@ -21,7 +21,6 @@
#include <iterator>
#include "base/bit_utils.h"
-#include "globals.h"
namespace art {
@@ -230,19 +229,6 @@
// Number of bits set in range [0, end) in storage. (No range check.)
static uint32_t NumSetBits(const uint32_t* storage, uint32_t end);
- // Fill given memory region with the contents of the vector and zero padding.
- void CopyTo(void* dst, size_t len) const {
- DCHECK_LE(static_cast<size_t>(GetHighestBitSet() + 1), len * kBitsPerByte);
- size_t vec_len = GetSizeOf();
- if (vec_len < len) {
- void* dst_padding = reinterpret_cast<uint8_t*>(dst) + vec_len;
- memcpy(dst, storage_, vec_len);
- memset(dst_padding, 0, len - vec_len);
- } else {
- memcpy(dst, storage_, len);
- }
- }
-
void Dump(std::ostream& os, const char* prefix) const;
private:
diff --git a/runtime/base/bit_vector_test.cc b/runtime/base/bit_vector_test.cc
index 19c01f2..c51b9b0 100644
--- a/runtime/base/bit_vector_test.cc
+++ b/runtime/base/bit_vector_test.cc
@@ -211,62 +211,4 @@
}
}
-TEST(BitVector, CopyTo) {
- {
- // Test copying an empty BitVector. Padding should fill `buf` with zeroes.
- BitVector bv(0, true, Allocator::GetMallocAllocator());
- uint32_t buf;
-
- bv.CopyTo(&buf, sizeof(buf));
- EXPECT_EQ(0u, bv.GetSizeOf());
- EXPECT_EQ(0u, buf);
- }
-
- {
- // Test copying when `bv.storage_` and `buf` are of equal lengths.
- BitVector bv(0, true, Allocator::GetMallocAllocator());
- uint32_t buf;
-
- bv.SetBit(0);
- bv.SetBit(17);
- bv.SetBit(26);
- EXPECT_EQ(sizeof(buf), bv.GetSizeOf());
-
- bv.CopyTo(&buf, sizeof(buf));
- EXPECT_EQ(0x04020001u, buf);
- }
-
- {
- // Test copying when the `bv.storage_` is longer than `buf`. As long as
- // `buf` is long enough to hold all set bits, copying should succeed.
- BitVector bv(0, true, Allocator::GetMallocAllocator());
- uint8_t buf[5];
-
- bv.SetBit(18);
- bv.SetBit(39);
- EXPECT_LT(sizeof(buf), bv.GetSizeOf());
-
- bv.CopyTo(buf, sizeof(buf));
- EXPECT_EQ(0x00u, buf[0]);
- EXPECT_EQ(0x00u, buf[1]);
- EXPECT_EQ(0x04u, buf[2]);
- EXPECT_EQ(0x00u, buf[3]);
- EXPECT_EQ(0x80u, buf[4]);
- }
-
- {
- // Test zero padding when `bv.storage_` is shorter than `buf`.
- BitVector bv(0, true, Allocator::GetMallocAllocator());
- uint32_t buf[2];
-
- bv.SetBit(18);
- bv.SetBit(31);
- EXPECT_GT(sizeof(buf), bv.GetSizeOf());
-
- bv.CopyTo(buf, sizeof(buf));
- EXPECT_EQ(0x80040000U, buf[0]);
- EXPECT_EQ(0x00000000U, buf[1]);
- }
-}
-
} // namespace art
diff --git a/runtime/stack_map.h b/runtime/stack_map.h
index ba0b6d6..eefdaa7 100644
--- a/runtime/stack_map.h
+++ b/runtime/stack_map.h
@@ -671,7 +671,9 @@
void SetStackMask(const CodeInfo& info, const BitVector& sp_map) {
MemoryRegion region = GetStackMask(info);
- sp_map.CopyTo(region.start(), region.size());
+ for (size_t i = 0; i < region.size_in_bits(); i++) {
+ region.StoreBit(i, sp_map.IsBitSet(i));
+ }
}
bool HasDexRegisterMap(const CodeInfo& info) const {