commit 349e486f5e6c8f8dd482641a27f9e7cce04ea623
author Vladimir Marko <vmarko@google.com> Thu Oct 09 17:39:46 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 09 17:39:46 2014 +0000
tree 5d943c2dc244184b61215d2d5715ff9ec1001ec6
parent 4ecaf87a2b62f4e51ee4c1f8b32aaea1473187a2
parent 3b37073e52f3b8a2a9e16bc9a019ef2607a97245

Merge "Fix arm64 build: move macro usage after definition."

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 252e89e..52a2a88 100644
--- a/runtime/arch/arm64/quick_entrypoints_arm64.S
+++ b/runtime/arch/arm64/quick_entrypoints_arm64.S
@@ -937,12 +937,6 @@
 END art_quick_do_long_jump
 
     /*
-     * Entry from managed code that calls artHandleFillArrayDataFromCode and delivers exception on
-     * failure.
-     */
-TWO_ARG_REF_DOWNCALL art_quick_handle_fill_data, artHandleFillArrayDataFromCode, RETURN_IF_W0_IS_ZERO_OR_DELIVER
-
-    /*
      * Entry from managed code that calls artLockObjectFromCode, may block for GC. x0 holds the
      * possibly null object to lock.
      *
@@ -1248,6 +1242,12 @@
 .endm
 
     /*
+     * Entry from managed code that calls artHandleFillArrayDataFromCode and delivers exception on
+     * failure.
+     */
+TWO_ARG_REF_DOWNCALL art_quick_handle_fill_data, artHandleFillArrayDataFromCode, RETURN_IF_W0_IS_ZERO_OR_DELIVER
+
+    /*
      * Entry from managed code when uninitialized static storage, this stub will run the class
      * initializer and deliver the exception on error. On success the static storage base is
      * returned.