commit 47d31853e16a95393d760e6be2ffeeb0193f94a1
author Vladimir Marko <vmarko@google.com> Tue Nov 28 18:36:12 2017 +0000
committer Vladimir Marko <vmarko@google.com> Tue Nov 28 18:36:12 2017 +0000
tree 344b0fddbbcc9a64bed2ba20dbe73fb227c2bdf4
parent 3417eaefe4e714c489a6fb0cb89b4810d81bdf4d

Revert "JIT JNI stubs."

Seems to break 998-redefine-use-after-free in
some --no-image configuration.

Bug: 65574695
Bug: 69843562

This reverts commit 3417eaefe4e714c489a6fb0cb89b4810d81bdf4d.

Change-Id: I2dd157b931c17c791522ea2544c1982ed3519b86

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