commit 9877855b59abd42112fa799c143255d3f8d9da3d
author Vladimir Marko <vmarko@google.com> Mon Jun 12 14:04:52 2017 +0100
committer Vladimir Marko <vmarko@google.com> Mon Jun 12 14:07:10 2017 +0100
tree 444a1080b52cf77926393515cbbc598e7a7b152f
parent fed9cb178be878f4e5ff862ac78ae2cf5ad305d3

x86/x86-64: Fix art_quick_instrumentation_exit CFI.

Test: Rely on TreeHugger.
Bug: 62490325
Change-Id: I1918cc21d67e61996224bec9a4ddf2e2098a649c

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 2222f5c..ae0a216 100644
--- a/runtime/arch/x86/quick_entrypoints_x86.S
+++ b/runtime/arch/x86/quick_entrypoints_x86.S
@@ -1982,7 +1982,7 @@
     ret                           // Call method (and pop).
 END_FUNCTION art_quick_instrumentation_entry
 
-DEFINE_FUNCTION art_quick_instrumentation_exit
+DEFINE_FUNCTION_CUSTOM_CFA art_quick_instrumentation_exit, 0
     pushl LITERAL(0)              // Push a fake return PC as there will be none on the stack.
     CFI_ADJUST_CFA_OFFSET(4)
     SETUP_SAVE_REFS_ONLY_FRAME ebx, ebx

runtime/arch/x86_64/quick_entrypoints_x86_64.S

diff --git a/runtime/arch/x86_64/quick_entrypoints_x86_64.S b/runtime/arch/x86_64/quick_entrypoints_x86_64.S
index 41651d8..55fcf89 100644
--- a/runtime/arch/x86_64/quick_entrypoints_x86_64.S
+++ b/runtime/arch/x86_64/quick_entrypoints_x86_64.S
@@ -1936,8 +1936,9 @@
 #endif  // __APPLE__
 END_FUNCTION art_quick_instrumentation_entry
 
-DEFINE_FUNCTION art_quick_instrumentation_exit
+DEFINE_FUNCTION_CUSTOM_CFA art_quick_instrumentation_exit, 0
     pushq LITERAL(0)          // Push a fake return PC as there will be none on the stack.
+    CFI_ADJUST_CFA_OFFSET(8)
 
     SETUP_SAVE_REFS_ONLY_FRAME