From 3f699ae23266b2c4adc98958dcbd80c71c2c3284 Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Thu, 13 Oct 2016 15:12:20 +0000 Subject: [PATCH] Revert "jni: Disable FastNative path for methods returning objects" This reverts commit 6f029d9cfae142f318e3986331b04695f3ea524a. Change-Id: I075bbf55a07565118b8fa529a397bb42490e6e51 --- compiler/jni/quick/jni_compiler.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/jni/quick/jni_compiler.cc b/compiler/jni/quick/jni_compiler.cc index e17144192..21804e314 100644 --- a/compiler/jni/quick/jni_compiler.cc +++ b/compiler/jni/quick/jni_compiler.cc @@ -348,7 +348,7 @@ static CompiledMethod* ArtJniCompileMethodInternal(CompilerDriver* driver, ThreadOffset jni_start = is_synchronized ? QUICK_ENTRYPOINT_OFFSET(kPointerSize, pJniMethodStartSynchronized) - : ((is_fast_native && !reference_return) // TODO: support @FastNative returning obj + : (is_fast_native ? QUICK_ENTRYPOINT_OFFSET(kPointerSize, pJniMethodFastStart) : QUICK_ENTRYPOINT_OFFSET(kPointerSize, pJniMethodStart)); -- 2.11.0