OSDN Git Service

Revert "jni: Disable FastNative path for methods returning objects"
authorIgor Murashkin <iam@google.com>
Thu, 13 Oct 2016 15:12:20 +0000 (15:12 +0000)
committerIgor Murashkin <iam@google.com>
Wed, 19 Oct 2016 18:33:33 +0000 (11:33 -0700)
This reverts commit 6f029d9cfae142f318e3986331b04695f3ea524a.

Change-Id: I075bbf55a07565118b8fa529a397bb42490e6e51

compiler/jni/quick/jni_compiler.cc

index e171441..21804e3 100644 (file)
@@ -348,7 +348,7 @@ static CompiledMethod* ArtJniCompileMethodInternal(CompilerDriver* driver,
     ThreadOffset<kPointerSize> 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));