summaryrefslogtreecommitdiffstats
path: root/runtime/arch/x86_64
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2015-06-27 15:42:27 -0700
committerAndreas Gampe <agampe@google.com>2015-06-29 14:02:33 -0700
commite7d876adcfc1977800264ab7540aa488c1568b48 (patch)
tree3e8531d9822fd08022466d5d5970dad585f40ca7 /runtime/arch/x86_64
parentd735c41e95a5d89cc9dad0c78d7d052579d8bd41 (diff)
downloadart-e7d876adcfc1977800264ab7540aa488c1568b48.zip
art-e7d876adcfc1977800264ab7540aa488c1568b48.tar.gz
art-e7d876adcfc1977800264ab7540aa488c1568b48.tar.bz2
ART: Fix CFI annotation for art_quick_aput_obj
Fix the CFI state after an early return. Bug: 22014525 (cherry picked from commit 2738639bcd30b908d825725169b7497ed047debb) Change-Id: I56b9ba8cf8c47d70a642f064e59c7e04a476dd2f
Diffstat (limited to 'runtime/arch/x86_64')
-rw-r--r--runtime/arch/x86_64/quick_entrypoints_x86_64.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/arch/x86_64/quick_entrypoints_x86_64.S b/runtime/arch/x86_64/quick_entrypoints_x86_64.S
index 62eebd4..f11eb06 100644
--- a/runtime/arch/x86_64/quick_entrypoints_x86_64.S
+++ b/runtime/arch/x86_64/quick_entrypoints_x86_64.S
@@ -1243,6 +1243,7 @@ DEFINE_FUNCTION art_quick_aput_obj
movb %dl, (%rdx, %rdi) // Note: this assumes that top 32b of %rdi are zero
// movb %dl, (%rdx, %rdi)
ret
+ CFI_ADJUST_CFA_OFFSET(32 + 4 * 8) // Reset unwind info so following code unwinds.
.Lthrow_array_store_exception:
RESTORE_FP_CALLEE_SAVE_FRAME
// Restore arguments.