Ensure stack maps are 4 byte aligned.
With the recent move to gcc 4.9, we are hitting alignment
SIGBUS on ARM. The reason is that gcc will optimize two consecutive
32bits loads into one 64bits load, and the instruction (ldrd)
will fail if the data is not aligned.
Also removed the emission of mapping table when a method is optimized.
The information can be found in the StackMap itself.
Change-Id: Icf79406c18a3f4db3c05d52fc2c0dd2e35bf0f8f
diff --git a/compiler/compiled_method.h b/compiler/compiled_method.h
index 7f76eef..d2f5d01 100644
--- a/compiler/compiled_method.h
+++ b/compiler/compiled_method.h
@@ -291,7 +291,6 @@
const size_t frame_size_in_bytes,
const uint32_t core_spill_mask,
const uint32_t fp_spill_mask,
- const std::vector<uint8_t>& mapping_table,
const std::vector<uint8_t>& vmap_table);
// Constructs a CompiledMethod for the QuickJniCompiler.
@@ -330,9 +329,8 @@
return *src_mapping_table_;
}
- const std::vector<uint8_t>& GetMappingTable() const {
- DCHECK(mapping_table_ != nullptr);
- return *mapping_table_;
+ std::vector<uint8_t> const* GetMappingTable() const {
+ return mapping_table_;
}
const std::vector<uint8_t>& GetVmapTable() const {