commit 6b90d42316e0370c789dddb5dda48d7403ea378f
author Andreas Gampe <agampe@google.com> Fri Jun 26 19:49:24 2015 -0700
committer Andreas Gampe <agampe@google.com> Fri Jun 26 19:51:35 2015 -0700
tree 69af01ba975dd1c149e676fef1c94da99577c246
parent 921c7a62ba9dd6a4a855b08eca7cc1aae081adeb

ART: Fix CFI annotation in arm64, x86 and x86-64 assembly

To be able to unroll in the exception case, the state needs to be
reset to before the jump.

Bug: 22014525
Change-Id: Ic60400b5bf0efcb713c24df1728623d072f344ab

runtime/arch/x86/quick_entrypoints_x86.S

diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S
index bee379e..98d0812 100644
--- a/runtime/arch/x86/quick_entrypoints_x86.S
+++ b/runtime/arch/x86/quick_entrypoints_x86.S
@@ -1105,6 +1105,8 @@
     addl LITERAL(12), %esp        // pop arguments
     CFI_ADJUST_CFA_OFFSET(-12)
     ret
+
+    CFI_ADJUST_CFA_OFFSET(12)     // Reset unwind info so following code unwinds.
 1:
     POP eax                       // pop arguments
     POP ecx