commit 3417eaefe4e714c489a6fb0cb89b4810d81bdf4d
author Vladimir Marko <vmarko@google.com> Thu Sep 21 18:14:28 2017 +0100
committer Vladimir Marko <vmarko@google.com> Tue Nov 28 13:00:09 2017 +0000
tree fe97f5191d25d26ef4250280f4c599b3a50f2059
parent 7bdc6e73fd97eb75f30b77f183e4fe6c2c599a09

JIT JNI stubs.

Allow the JIT compiler to compile JNI stubs and make sure
they can be collected once they are not in use anymore.

Test: 667-jit-jni-stub
Test: Pixel 2 XL boots.
Test: m test-art-host-gtest
Test: testrunner.py --host --jit
Test: testrunner.py --target --jit
Bug: 65574695
Change-Id: Idf81f50bcfa68c0c403ad2b49058be62b21b7b1f

runtime/arch/mips/quick_entrypoints_mips.S

diff --git a/runtime/arch/mips/quick_entrypoints_mips.S b/runtime/arch/mips/quick_entrypoints_mips.S
index 489c52c..fc77a64 100644
--- a/runtime/arch/mips/quick_entrypoints_mips.S
+++ b/runtime/arch/mips/quick_entrypoints_mips.S
@@ -2283,7 +2283,8 @@
     nop
 
 2:
-    lw      $sp, THREAD_TOP_QUICK_FRAME_OFFSET(rSELF)
+    lw      $t0, THREAD_TOP_QUICK_FRAME_OFFSET(rSELF)
+    addiu   $sp, $t0, -1  // Remove the GenericJNI tag.
     move    $gp, $s3               # restore $gp from $s3
     # This will create a new save-all frame, required by the runtime.
     DELIVER_PENDING_EXCEPTION