diff options
| author | Tong Shen <endlessroad@google.com> | 2014-08-05 01:54:19 -0700 |
|---|---|---|
| committer | Tong Shen <endlessroad@google.com> | 2014-08-05 11:11:33 -0700 |
| commit | 547cdfd21ee21e4ab9ca8692d6ef47c62ee7ea52 (patch) | |
| tree | 078d52b6025fc1e42b7343550b0dbbdad69eafac /compiler/compiled_method.cc | |
| parent | 8b62dc0f993d0445401655fc274e5225498fa81c (diff) | |
| download | art-547cdfd21ee21e4ab9ca8692d6ef47c62ee7ea52.tar.gz art-547cdfd21ee21e4ab9ca8692d6ef47c62ee7ea52.tar.bz2 art-547cdfd21ee21e4ab9ca8692d6ef47c62ee7ea52.zip | |
Emit CFI for x86 & x86_64 JNI compiler.
Now for host-side x86 & x86_64 ART, we are able to get complete stacktrace with even mixed C/C++ & Java stack frames.
Testing:
1. art/test/run-test --host --gdb [--64] --no-relocate 005
2. In gdb, run 'b art::Class_classForName' which is implementation of a Java native method, then 'r'
3. In gdb, run 'bt'. You should see stack frames down to main()
Change-Id: I2d17e9aa0f6d42d374b5362a15ea35a2fce96302
Diffstat (limited to 'compiler/compiled_method.cc')
| -rw-r--r-- | compiler/compiled_method.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/compiled_method.cc b/compiler/compiled_method.cc index f098a34ea7..f2a8d84731 100644 --- a/compiler/compiled_method.cc +++ b/compiler/compiled_method.cc @@ -165,14 +165,15 @@ CompiledMethod::CompiledMethod(CompilerDriver* driver, const std::vector<uint8_t>& code, const size_t frame_size_in_bytes, const uint32_t core_spill_mask, - const uint32_t fp_spill_mask) + const uint32_t fp_spill_mask, + const std::vector<uint8_t>* cfi_info) : CompiledCode(driver, instruction_set, code), frame_size_in_bytes_(frame_size_in_bytes), core_spill_mask_(core_spill_mask), fp_spill_mask_(fp_spill_mask), mapping_table_(driver->DeduplicateMappingTable(std::vector<uint8_t>())), vmap_table_(driver->DeduplicateVMapTable(std::vector<uint8_t>())), gc_map_(driver->DeduplicateGCMap(std::vector<uint8_t>())), - cfi_info_(nullptr) { + cfi_info_(driver->DeduplicateCFIInfo(cfi_info)) { } // Constructs a CompiledMethod for the Portable compiler. |