Revert "Stack maps: Interleave consecutive varints."
This reverts commit a2b34561a7faca95d0a4f8194ad155798e238e37.
Reason for revert: <INSERT REASONING HERE>
Change-Id: Ie5b220e429e101bb5fa2606665a9c8cb64308ad3
Bug: 135638469
diff --git a/compiler/optimizing/stack_map_stream.cc b/compiler/optimizing/stack_map_stream.cc
index 87e15ba..87702cc 100644
--- a/compiler/optimizing/stack_map_stream.cc
+++ b/compiler/optimizing/stack_map_stream.cc
@@ -307,14 +307,12 @@
ScopedArenaVector<uint8_t> buffer(allocator_->Adapter(kArenaAllocStackMapStream));
BitMemoryWriter<ScopedArenaVector<uint8_t>> out(&buffer);
- out.WriteInterleavedVarints(std::array<uint32_t, CodeInfo::kNumHeaders>{
- flags,
- packed_frame_size_,
- core_spill_mask_,
- fp_spill_mask_,
- num_dex_registers_,
- bit_table_flags,
- });
+ out.WriteVarint(flags);
+ out.WriteVarint(packed_frame_size_);
+ out.WriteVarint(core_spill_mask_);
+ out.WriteVarint(fp_spill_mask_);
+ out.WriteVarint(num_dex_registers_);
+ out.WriteVarint(bit_table_flags);
ForEachBitTable([&out](size_t, auto bit_table) {
if (bit_table->size() != 0) { // Skip empty bit-tables.
bit_table->Encode(out);