diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-12-09 14:26:32 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-12-09 14:49:02 +0000 |
| commit | 376b2bbf7c39108223a7a01568a7b4b04d84eeac (patch) | |
| tree | f6fdbe6180c3d330bc24aa35a7d9fa51f3eb1c55 /compiler/common_compiler_test.cc | |
| parent | b1a38e246cfbfb21100d9c9e57f33970e824f075 (diff) | |
| download | android_art-376b2bbf7c39108223a7a01568a7b4b04d84eeac.tar.gz android_art-376b2bbf7c39108223a7a01568a7b4b04d84eeac.tar.bz2 android_art-376b2bbf7c39108223a7a01568a7b4b04d84eeac.zip | |
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
Diffstat (limited to 'compiler/common_compiler_test.cc')
| -rw-r--r-- | compiler/common_compiler_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc index a3d9a0bd6d..e84f65a06e 100644 --- a/compiler/common_compiler_test.cc +++ b/compiler/common_compiler_test.cc @@ -57,7 +57,7 @@ void CommonCompilerTest::MakeExecutable(mirror::ArtMethod* method) { const std::vector<uint8_t>& vmap_table = compiled_method->GetVmapTable(); uint32_t vmap_table_offset = vmap_table.empty() ? 0u : sizeof(OatQuickMethodHeader) + vmap_table.size(); - const std::vector<uint8_t>& mapping_table = compiled_method->GetMappingTable(); + const std::vector<uint8_t>& mapping_table = *compiled_method->GetMappingTable(); uint32_t mapping_table_offset = mapping_table.empty() ? 0u : sizeof(OatQuickMethodHeader) + vmap_table.size() + mapping_table.size(); const std::vector<uint8_t>& gc_map = *compiled_method->GetGcMap(); |