diff options
| author | 2016-10-12 22:23:36 +0000 | |
|---|---|---|
| committer | 2016-10-12 22:23:37 +0000 | |
| commit | 29b8c4d62c4fdee2a8cdef5e0791129303f09c36 (patch) | |
| tree | bc41c94fb673b1018bfac46f989c7d7b5f1657a5 /compiler | |
| parent | 3d9f2834ba7be001e49f51637b91fd4667b036e1 (diff) | |
| parent | 6f029d9cfae142f318e3986331b04695f3ea524a (diff) | |
Merge "jni: Disable FastNative path for methods returning objects"
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/jni/quick/jni_compiler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/jni/quick/jni_compiler.cc b/compiler/jni/quick/jni_compiler.cc index 7e58d789d0..bfb342f966 100644 --- a/compiler/jni/quick/jni_compiler.cc +++ b/compiler/jni/quick/jni_compiler.cc @@ -322,7 +322,7 @@ static CompiledMethod* ArtJniCompileMethodInternal(CompilerDriver* driver, 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)); |