commit a8d8c65536bbc23ba93531ed40edf06955aa1fac
author Vladimir Marko <vmarko@google.com> Mon Jun 12 15:49:09 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jun 12 15:49:09 2017 +0000
tree 4c121d574c6ea7f31a22cac652f52e9491258c7b
parent 7ed7c8a481b78110208914d832f7a9227dedb68f
parent 74418c3146babc41a85451e1ca9b0f2ed51a759c

Merge "x86/x86-64: Fix art_quick_instrumentation_exit CFI." am: d455b87f48
am: 74418c3146

Change-Id: I9b736f59479d756e2999b1e3cf5c27b1907a00ca

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 4fb3fe5..031b36b 100644
--- a/runtime/arch/x86/quick_entrypoints_x86.S
+++ b/runtime/arch/x86/quick_entrypoints_x86.S
@@ -1994,7 +1994,7 @@
     DELIVER_PENDING_EXCEPTION
 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 46d4f41..ad06873 100644
--- a/runtime/arch/x86_64/quick_entrypoints_x86_64.S
+++ b/runtime/arch/x86_64/quick_entrypoints_x86_64.S
@@ -1941,8 +1941,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