commit 20e7d600cdcba4b1ab2f4e01e14903d641fbc073
author Sebastien Hertz <shertz@google.com> Thu Mar 12 15:10:50 2015 +0100
committer Sebastien Hertz <shertz@google.com> Thu Mar 12 15:15:04 2015 +0100
tree 81f0b0eb348aced18fe43862c284912042d7bb66
parent bf5565a75876a84c8c2401df597d922a7870a8f2

Fix art_quick_instrumentation_exit stub for x86_64

Restores callee-saved registers.

Bug: 19708384
Change-Id: I1cb47b1cc616af613816c4ee041bdfc975bf9f20

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 65c65e2..0f874a4 100644
--- a/runtime/arch/x86_64/quick_entrypoints_x86_64.S
+++ b/runtime/arch/x86_64/quick_entrypoints_x86_64.S
@@ -1551,7 +1551,9 @@
     CFI_ADJUST_CFA_OFFSET(-8)
     POP rax                   // Restore integer result.
 
-    addq LITERAL(FRAME_SIZE_REFS_ONLY_CALLEE_SAVE), %rsp   // Drop save frame and fake return pc.
+    RESTORE_REFS_ONLY_CALLEE_SAVE_FRAME
+
+    addq LITERAL(8), %rsp     // Drop fake return pc.
 
     jmp   *%rdi               // Return.
 END_FUNCTION art_quick_instrumentation_exit