OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b0d2fe8
)
Revert "jni: Disable FastNative path for methods returning objects"
author
Igor Murashkin
<iam@google.com>
Thu, 13 Oct 2016 15:12:20 +0000
(15:12 +0000)
committer
Igor 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
patch
|
blob
|
history
diff --git
a/compiler/jni/quick/jni_compiler.cc
b/compiler/jni/quick/jni_compiler.cc
index
e171441
..
21804e3
100644
(file)
--- a/
compiler/jni/quick/jni_compiler.cc
+++ b/
compiler/jni/quick/jni_compiler.cc
@@
-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));