commit bf92b3f2d3374eab6bc40cc41574b51aae5a3718
author Vladimir Marko <vmarko@google.com> Wed Jan 17 18:11:30 2018 +0000
committer Vladimir Marko <vmarko@google.com> Wed Jan 17 18:19:32 2018 +0000
tree e61d010ac4ce27810d0d34ffeca694a46c2a2fd5
parent fa0b0db6fbdcbf20bf78c53500ac98cfc3a26208

Clean up art_quick_check_instance_of entrypoints.

Test: Rely on TreeHugger.
Change-Id: I848b8b711ac6bfa90999701a518e2e70b42c3d57

runtime/arch/arm64/quick_entrypoints_arm64.S

diff --git a/runtime/arch/arm64/quick_entrypoints_arm64.S b/runtime/arch/arm64/quick_entrypoints_arm64.S
index 96a1cad..b0e7b0a 100644
--- a/runtime/arch/arm64/quick_entrypoints_arm64.S
+++ b/runtime/arch/arm64/quick_entrypoints_arm64.S
@@ -1341,12 +1341,14 @@
     // Call runtime code
     bl artInstanceOfFromCode
 
+    // Restore LR.
+    RESTORE_REG xLR, 24
+
     // Check for exception
     cbz x0, .Lthrow_class_cast_exception
 
     // Restore and return
     .cfi_remember_state
-    RESTORE_REG xLR, 24
     RESTORE_TWO_REGS_DECREASE_FRAME x0, x1, 32
     ret
     .cfi_restore_state                // Reset unwind info so following code unwinds.
@@ -1354,7 +1356,6 @@
 
 .Lthrow_class_cast_exception:
     // Restore
-    RESTORE_REG xLR, 24
     RESTORE_TWO_REGS_DECREASE_FRAME x0, x1, 32
 
     SETUP_SAVE_ALL_CALLEE_SAVES_FRAME // save all registers as basis for long jump context