commit 6f029d9cfae142f318e3986331b04695f3ea524a
author Igor Murashkin <iam@google.com> Wed Oct 12 13:33:43 2016 -0700
committer Igor Murashkin <iam@google.com> Wed Oct 12 20:50:03 2016 +0000
tree bc41c94fb673b1018bfac46f989c7d7b5f1657a5
parent 3d9f2834ba7be001e49f51637b91fd4667b036e1

jni: Disable FastNative path for methods returning objects

Bug: 32088975
Change-Id: Iba3a8f5462829ccb38f771f8f940b57c4e6a1c3f

compiler/jni/quick/jni_compiler.cc

diff --git a/compiler/jni/quick/jni_compiler.cc b/compiler/jni/quick/jni_compiler.cc
index 7e58d78..bfb342f 100644
--- a/compiler/jni/quick/jni_compiler.cc
+++ b/compiler/jni/quick/jni_compiler.cc
@@ -322,7 +322,7 @@
     ThreadOffset<kPointerSize> jni_start =
         is_synchronized
             ? QUICK_ENTRYPOINT_OFFSET(kPointerSize, pJniMethodStartSynchronized)
-            : (is_fast_native
+            : ((is_fast_native && !reference_return)  // TODO: support @FastNative returning obj
                    ? QUICK_ENTRYPOINT_OFFSET(kPointerSize, pJniMethodFastStart)
                    : QUICK_ENTRYPOINT_OFFSET(kPointerSize, pJniMethodStart));