diff options
| author | Andreas Gampe <agampe@google.com> | 2015-06-29 21:23:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-29 21:23:23 +0000 |
| commit | 0ca5f9372aaf70538eb9769a4b13a314de2febbd (patch) | |
| tree | 02b52fd9134a386a8942afe01d771bcc760bb245 /runtime/arch/arm64 | |
| parent | 0e081c1156f99eaaf8876aac7c186df28061f82d (diff) | |
| parent | d5ec1ce96f8e444bb9bcd8b0a0a1a290fbf879bd (diff) | |
| download | art-0ca5f9372aaf70538eb9769a4b13a314de2febbd.tar.gz art-0ca5f9372aaf70538eb9769a4b13a314de2febbd.tar.bz2 art-0ca5f9372aaf70538eb9769a4b13a314de2febbd.zip | |
am d5ec1ce9: am 3b0667c1: Merge "ART: Fix CFI annotation for art_quick_aput_obj"
* commit 'd5ec1ce96f8e444bb9bcd8b0a0a1a290fbf879bd':
ART: Fix CFI annotation for art_quick_aput_obj
Diffstat (limited to 'runtime/arch/arm64')
| -rw-r--r-- | runtime/arch/arm64/quick_entrypoints_arm64.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/arch/arm64/quick_entrypoints_arm64.S b/runtime/arch/arm64/quick_entrypoints_arm64.S index f3c111f99f..614936b93f 100644 --- a/runtime/arch/arm64/quick_entrypoints_arm64.S +++ b/runtime/arch/arm64/quick_entrypoints_arm64.S @@ -1206,6 +1206,7 @@ ENTRY art_quick_aput_obj lsr x0, x0, #7 strb w3, [x3, x0] ret + .cfi_adjust_cfa_offset 32 // 4 restores after cbz for unwinding. .Lthrow_array_store_exception: ldp x2, x30, [sp, #16] .cfi_restore x2 |